From e50398390133f1912f15fb83d65d62b2c9f40747 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 31 Jan 2010 23:34:58 -0800 Subject: [PATCH] --- yaml --- r: 180205 b: refs/heads/master c: 1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4 h: refs/heads/master i: 180203: 08bcb537d9ea1a1845ab21e3cec2668a475e75fa v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be_main.c | 2 +- trunk/drivers/net/usb/cdc_ether.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae6505f9a98a..4f3c85c81f57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bf8268f9a91f1065c99503161ebd061492bebe3 +refs/heads/master: 1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4 diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c index 90c5661b336f..6f2633887dc3 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/drivers/net/benet/be_main.c @@ -2168,7 +2168,7 @@ static int be_stats_init(struct be_adapter *adapter) cmd->va = pci_alloc_consistent(adapter->pdev, cmd->size, &cmd->dma); if (cmd->va == NULL) return -1; - memset(cmd->va, cmd->size, 0); + memset(cmd->va, 0, cmd->size); return 0; } diff --git a/trunk/drivers/net/usb/cdc_ether.c b/trunk/drivers/net/usb/cdc_ether.c index 21e183a83b99..4f27f022fbf7 100644 --- a/trunk/drivers/net/usb/cdc_ether.c +++ b/trunk/drivers/net/usb/cdc_ether.c @@ -419,7 +419,7 @@ static int cdc_manage_power(struct usbnet *dev, int on) static const struct driver_info cdc_info = { .description = "CDC Ethernet Device", - .flags = FLAG_ETHER | FLAG_LINK_INTR, + .flags = FLAG_ETHER, // .check_connect = cdc_check_connect, .bind = cdc_bind, .unbind = usbnet_cdc_unbind,