diff options
Diffstat (limited to 'drivers/net/usb/mcs7830.c')
-rw-r--r-- | drivers/net/usb/mcs7830.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index 22cccda33366..cb164d6c9b51 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * MosChips MCS7830 based USB 2.0 Ethernet Devices | 2 | * MOSCHIP MCS7830 based USB 2.0 Ethernet Devices |
3 | * | 3 | * |
4 | * based on usbnet.c, asix.c and the vendor provided mcs7830 driver | 4 | * based on usbnet.c, asix.c and the vendor provided mcs7830 driver |
5 | * | 5 | * |
@@ -71,7 +71,7 @@ | |||
71 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ | 71 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ |
72 | ADVERTISE_10HALF | ADVERTISE_CSMA) | 72 | ADVERTISE_10HALF | ADVERTISE_CSMA) |
73 | 73 | ||
74 | /* HIF_REG_XX coressponding index value */ | 74 | /* HIF_REG_XX corresponding index value */ |
75 | enum { | 75 | enum { |
76 | HIF_REG_MULTICAST_HASH = 0x00, | 76 | HIF_REG_MULTICAST_HASH = 0x00, |
77 | HIF_REG_PACKET_GAP1 = 0x08, | 77 | HIF_REG_PACKET_GAP1 = 0x08, |
@@ -92,7 +92,7 @@ enum { | |||
92 | HIF_REG_CONFIG_TXENABLE = 0x08, | 92 | HIF_REG_CONFIG_TXENABLE = 0x08, |
93 | HIF_REG_CONFIG_SLEEPMODE = 0x04, | 93 | HIF_REG_CONFIG_SLEEPMODE = 0x04, |
94 | HIF_REG_CONFIG_ALLMULTICAST = 0x02, | 94 | HIF_REG_CONFIG_ALLMULTICAST = 0x02, |
95 | HIF_REG_CONFIG_PROMISCIOUS = 0x01, | 95 | HIF_REG_CONFIG_PROMISCUOUS = 0x01, |
96 | HIF_REG_ETHERNET_ADDR = 0x0f, | 96 | HIF_REG_ETHERNET_ADDR = 0x0f, |
97 | HIF_REG_22 = 0x15, | 97 | HIF_REG_22 = 0x15, |
98 | HIF_REG_PAUSE_THRESHOLD = 0x16, | 98 | HIF_REG_PAUSE_THRESHOLD = 0x16, |
@@ -417,7 +417,7 @@ static void mcs7830_set_multicast(struct net_device *net) | |||
417 | data->config |= HIF_REG_CONFIG_ALLMULTICAST; | 417 | data->config |= HIF_REG_CONFIG_ALLMULTICAST; |
418 | 418 | ||
419 | if (net->flags & IFF_PROMISC) { | 419 | if (net->flags & IFF_PROMISC) { |
420 | data->config |= HIF_REG_CONFIG_PROMISCIOUS; | 420 | data->config |= HIF_REG_CONFIG_PROMISCUOUS; |
421 | } else if (net->flags & IFF_ALLMULTI || | 421 | } else if (net->flags & IFF_ALLMULTI || |
422 | net->mc_count > MCS7830_MAX_MCAST) { | 422 | net->mc_count > MCS7830_MAX_MCAST) { |
423 | data->config |= HIF_REG_CONFIG_ALLMULTICAST; | 423 | data->config |= HIF_REG_CONFIG_ALLMULTICAST; |
@@ -522,7 +522,7 @@ static const struct net_device_ops mcs7830_netdev_ops = { | |||
522 | .ndo_validate_addr = eth_validate_addr, | 522 | .ndo_validate_addr = eth_validate_addr, |
523 | .ndo_do_ioctl = mcs7830_ioctl, | 523 | .ndo_do_ioctl = mcs7830_ioctl, |
524 | .ndo_set_multicast_list = mcs7830_set_multicast, | 524 | .ndo_set_multicast_list = mcs7830_set_multicast, |
525 | .ndo_set_mac_address = mcs7830_set_mac_address, | 525 | .ndo_set_mac_address = mcs7830_set_mac_address, |
526 | }; | 526 | }; |
527 | 527 | ||
528 | static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) | 528 | static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) |
@@ -553,7 +553,7 @@ out: | |||
553 | return ret; | 553 | return ret; |
554 | } | 554 | } |
555 | 555 | ||
556 | /* The chip always appends a status bytes that we need to strip */ | 556 | /* The chip always appends a status byte that we need to strip */ |
557 | static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | 557 | static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb) |
558 | { | 558 | { |
559 | u8 status; | 559 | u8 status; |