projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'driver-core-next' into Linux 3.2
[linux-2.6-block.git]
/
drivers
/
net
/
usb
/
smsc75xx.c
diff --git
a/drivers/net/usb/smsc75xx.c
b/drivers/net/usb/smsc75xx.c
index 22a7cf951e728132b6f55d0d99584fc50e374eaa..e85840ee36e0d566cf7e8a9569246172a279052b 100644
(file)
--- a/
drivers/net/usb/smsc75xx.c
+++ b/
drivers/net/usb/smsc75xx.c
@@
-51,6
+51,7
@@
#define USB_VENDOR_ID_SMSC (0x0424)
#define USB_PRODUCT_ID_LAN7500 (0x7500)
#define USB_PRODUCT_ID_LAN7505 (0x7505)
#define USB_VENDOR_ID_SMSC (0x0424)
#define USB_PRODUCT_ID_LAN7500 (0x7500)
#define USB_PRODUCT_ID_LAN7505 (0x7505)
+#define RXW_PADDING 2
#define check_warn(ret, fmt, args...) \
({ if (ret < 0) netdev_warn(dev->net, fmt, ##args); })
#define check_warn(ret, fmt, args...) \
({ if (ret < 0) netdev_warn(dev->net, fmt, ##args); })
@@
-1088,13
+1089,13
@@
static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
memcpy(&rx_cmd_b, skb->data, sizeof(rx_cmd_b));
le32_to_cpus(&rx_cmd_b);
memcpy(&rx_cmd_b, skb->data, sizeof(rx_cmd_b));
le32_to_cpus(&rx_cmd_b);
- skb_pull(skb, 4 +
NET_IP_ALIGN
);
+ skb_pull(skb, 4 +
RXW_PADDING
);
packet = skb->data;
/* get the packet length */
packet = skb->data;
/* get the packet length */
- size = (rx_cmd_a & RX_CMD_A_LEN) -
NET_IP_ALIGN
;
- align_count = (4 - ((size +
NET_IP_ALIGN
) % 4)) % 4;
+ size = (rx_cmd_a & RX_CMD_A_LEN) -
RXW_PADDING
;
+ align_count = (4 - ((size +
RXW_PADDING
) % 4)) % 4;
if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
netif_dbg(dev, rx_err, dev->net,
if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
netif_dbg(dev, rx_err, dev->net,
@@
-1236,17
+1237,7
@@
static struct usb_driver smsc75xx_driver = {
.disconnect = usbnet_disconnect,
};
.disconnect = usbnet_disconnect,
};
-static int __init smsc75xx_init(void)
-{
- return usb_register(&smsc75xx_driver);
-}
-module_init(smsc75xx_init);
-
-static void __exit smsc75xx_exit(void)
-{
- usb_deregister(&smsc75xx_driver);
-}
-module_exit(smsc75xx_exit);
+module_usb_driver(smsc75xx_driver);
MODULE_AUTHOR("Nancy Lin");
MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>");
MODULE_AUTHOR("Nancy Lin");
MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>");