diff options
Diffstat (limited to 'drivers/net/usb/asix.c')
-rw-r--r-- | drivers/net/usb/asix.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 6ce7f775bb74..a516185cbc9f 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
@@ -365,8 +365,8 @@ static struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | |||
365 | 365 | ||
366 | padlen = ((skb->len + 4) % 512) ? 0 : 4; | 366 | padlen = ((skb->len + 4) % 512) ? 0 : 4; |
367 | 367 | ||
368 | if ((!skb_cloned(skb)) | 368 | if ((!skb_cloned(skb)) && |
369 | && ((headroom + tailroom) >= (4 + padlen))) { | 369 | ((headroom + tailroom) >= (4 + padlen))) { |
370 | if ((headroom < 4) || (tailroom < padlen)) { | 370 | if ((headroom < 4) || (tailroom < padlen)) { |
371 | skb->data = memmove(skb->head + 4, skb->data, skb->len); | 371 | skb->data = memmove(skb->head + 4, skb->data, skb->len); |
372 | skb_set_tail_pointer(skb, skb->len); | 372 | skb_set_tail_pointer(skb, skb->len); |
@@ -541,8 +541,8 @@ static void asix_set_multicast(struct net_device *net) | |||
541 | 541 | ||
542 | if (net->flags & IFF_PROMISC) { | 542 | if (net->flags & IFF_PROMISC) { |
543 | rx_ctl |= AX_RX_CTL_PRO; | 543 | rx_ctl |= AX_RX_CTL_PRO; |
544 | } else if (net->flags & IFF_ALLMULTI | 544 | } else if (net->flags & IFF_ALLMULTI || |
545 | || net->mc_count > AX_MAX_MCAST) { | 545 | net->mc_count > AX_MAX_MCAST) { |
546 | rx_ctl |= AX_RX_CTL_AMALL; | 546 | rx_ctl |= AX_RX_CTL_AMALL; |
547 | } else if (net->mc_count == 0) { | 547 | } else if (net->mc_count == 0) { |
548 | /* just broadcast and directed */ | 548 | /* just broadcast and directed */ |
@@ -753,8 +753,8 @@ static void ax88172_set_multicast(struct net_device *net) | |||
753 | 753 | ||
754 | if (net->flags & IFF_PROMISC) { | 754 | if (net->flags & IFF_PROMISC) { |
755 | rx_ctl |= 0x01; | 755 | rx_ctl |= 0x01; |
756 | } else if (net->flags & IFF_ALLMULTI | 756 | } else if (net->flags & IFF_ALLMULTI || |
757 | || net->mc_count > AX_MAX_MCAST) { | 757 | net->mc_count > AX_MAX_MCAST) { |
758 | rx_ctl |= 0x02; | 758 | rx_ctl |= 0x02; |
759 | } else if (net->mc_count == 0) { | 759 | } else if (net->mc_count == 0) { |
760 | /* just broadcast and directed */ | 760 | /* just broadcast and directed */ |
@@ -1327,7 +1327,7 @@ static const struct driver_info ax8817x_info = { | |||
1327 | .status = asix_status, | 1327 | .status = asix_status, |
1328 | .link_reset = ax88172_link_reset, | 1328 | .link_reset = ax88172_link_reset, |
1329 | .reset = ax88172_link_reset, | 1329 | .reset = ax88172_link_reset, |
1330 | .flags = FLAG_ETHER, | 1330 | .flags = FLAG_ETHER | FLAG_LINK_INTR, |
1331 | .data = 0x00130103, | 1331 | .data = 0x00130103, |
1332 | }; | 1332 | }; |
1333 | 1333 | ||
@@ -1337,7 +1337,7 @@ static const struct driver_info dlink_dub_e100_info = { | |||
1337 | .status = asix_status, | 1337 | .status = asix_status, |
1338 | .link_reset = ax88172_link_reset, | 1338 | .link_reset = ax88172_link_reset, |
1339 | .reset = ax88172_link_reset, | 1339 | .reset = ax88172_link_reset, |
1340 | .flags = FLAG_ETHER, | 1340 | .flags = FLAG_ETHER | FLAG_LINK_INTR, |
1341 | .data = 0x009f9d9f, | 1341 | .data = 0x009f9d9f, |
1342 | }; | 1342 | }; |
1343 | 1343 | ||
@@ -1347,7 +1347,7 @@ static const struct driver_info netgear_fa120_info = { | |||
1347 | .status = asix_status, | 1347 | .status = asix_status, |
1348 | .link_reset = ax88172_link_reset, | 1348 | .link_reset = ax88172_link_reset, |
1349 | .reset = ax88172_link_reset, | 1349 | .reset = ax88172_link_reset, |
1350 | .flags = FLAG_ETHER, | 1350 | .flags = FLAG_ETHER | FLAG_LINK_INTR, |
1351 | .data = 0x00130103, | 1351 | .data = 0x00130103, |
1352 | }; | 1352 | }; |
1353 | 1353 | ||
@@ -1357,7 +1357,7 @@ static const struct driver_info hawking_uf200_info = { | |||
1357 | .status = asix_status, | 1357 | .status = asix_status, |
1358 | .link_reset = ax88172_link_reset, | 1358 | .link_reset = ax88172_link_reset, |
1359 | .reset = ax88172_link_reset, | 1359 | .reset = ax88172_link_reset, |
1360 | .flags = FLAG_ETHER, | 1360 | .flags = FLAG_ETHER | FLAG_LINK_INTR, |
1361 | .data = 0x001f1d1f, | 1361 | .data = 0x001f1d1f, |
1362 | }; | 1362 | }; |
1363 | 1363 | ||
@@ -1367,7 +1367,7 @@ static const struct driver_info ax88772_info = { | |||
1367 | .status = asix_status, | 1367 | .status = asix_status, |
1368 | .link_reset = ax88772_link_reset, | 1368 | .link_reset = ax88772_link_reset, |
1369 | .reset = ax88772_link_reset, | 1369 | .reset = ax88772_link_reset, |
1370 | .flags = FLAG_ETHER | FLAG_FRAMING_AX, | 1370 | .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR, |
1371 | .rx_fixup = asix_rx_fixup, | 1371 | .rx_fixup = asix_rx_fixup, |
1372 | .tx_fixup = asix_tx_fixup, | 1372 | .tx_fixup = asix_tx_fixup, |
1373 | }; | 1373 | }; |
@@ -1378,7 +1378,7 @@ static const struct driver_info ax88178_info = { | |||
1378 | .status = asix_status, | 1378 | .status = asix_status, |
1379 | .link_reset = ax88178_link_reset, | 1379 | .link_reset = ax88178_link_reset, |
1380 | .reset = ax88178_link_reset, | 1380 | .reset = ax88178_link_reset, |
1381 | .flags = FLAG_ETHER | FLAG_FRAMING_AX, | 1381 | .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR, |
1382 | .rx_fixup = asix_rx_fixup, | 1382 | .rx_fixup = asix_rx_fixup, |
1383 | .tx_fixup = asix_tx_fixup, | 1383 | .tx_fixup = asix_tx_fixup, |
1384 | }; | 1384 | }; |