Skip to content

Commit

Permalink
Merge pull request torvalds#15 from steveglen/smsc95xx-patches
Browse files Browse the repository at this point in the history
Smsc95xx patches
  • Loading branch information
popcornmix committed May 7, 2012
2 parents 245cbe8 + f190109 commit 3a277d3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/net/usb/smsc95xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
dev->net->ethtool_ops = &smsc95xx_ethtool_ops;
dev->net->flags |= IFF_MULTICAST;
dev->net->hard_header_len += SMSC95XX_TX_OVERHEAD_CSUM;
dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
return 0;
}

Expand Down Expand Up @@ -1246,7 +1247,7 @@ static const struct driver_info smsc95xx_info = {
.rx_fixup = smsc95xx_rx_fixup,
.tx_fixup = smsc95xx_tx_fixup,
.status = smsc95xx_status,
.flags = FLAG_ETHER | FLAG_SEND_ZLP,
.flags = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
};

static const struct usb_device_id products[] = {
Expand Down

0 comments on commit 3a277d3

Please sign in to comment.