Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 183792
b: refs/heads/master
c: 00e4991
h: refs/heads/master
v: v3
  • Loading branch information
Andreas Mohr authored and David S. Miller committed Feb 4, 2010
1 parent e90ed44 commit 2ce77fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 76802851b6e1b78b614ba611d6b5d27a83f60ded
refs/heads/master: 00e499131e250324a89c93d5dd88c8f2b4bf6dbb
12 changes: 6 additions & 6 deletions trunk/drivers/net/usb/mcs7830.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* MosChips MCS7830 based USB 2.0 Ethernet Devices
* MOSCHIP MCS7830 based USB 2.0 Ethernet Devices
*
* based on usbnet.c, asix.c and the vendor provided mcs7830 driver
*
Expand Down Expand Up @@ -71,7 +71,7 @@
ADVERTISE_100HALF | ADVERTISE_10FULL | \
ADVERTISE_10HALF | ADVERTISE_CSMA)

/* HIF_REG_XX coressponding index value */
/* HIF_REG_XX corresponding index value */
enum {
HIF_REG_MULTICAST_HASH = 0x00,
HIF_REG_PACKET_GAP1 = 0x08,
Expand All @@ -92,7 +92,7 @@ enum {
HIF_REG_CONFIG_TXENABLE = 0x08,
HIF_REG_CONFIG_SLEEPMODE = 0x04,
HIF_REG_CONFIG_ALLMULTICAST = 0x02,
HIF_REG_CONFIG_PROMISCIOUS = 0x01,
HIF_REG_CONFIG_PROMISCUOUS = 0x01,
HIF_REG_ETHERNET_ADDR = 0x0f,
HIF_REG_22 = 0x15,
HIF_REG_PAUSE_THRESHOLD = 0x16,
Expand Down Expand Up @@ -417,7 +417,7 @@ static void mcs7830_set_multicast(struct net_device *net)
data->config |= HIF_REG_CONFIG_ALLMULTICAST;

if (net->flags & IFF_PROMISC) {
data->config |= HIF_REG_CONFIG_PROMISCIOUS;
data->config |= HIF_REG_CONFIG_PROMISCUOUS;
} else if (net->flags & IFF_ALLMULTI ||
net->mc_count > MCS7830_MAX_MCAST) {
data->config |= HIF_REG_CONFIG_ALLMULTICAST;
Expand Down Expand Up @@ -522,7 +522,7 @@ static const struct net_device_ops mcs7830_netdev_ops = {
.ndo_validate_addr = eth_validate_addr,
.ndo_do_ioctl = mcs7830_ioctl,
.ndo_set_multicast_list = mcs7830_set_multicast,
.ndo_set_mac_address = mcs7830_set_mac_address,
.ndo_set_mac_address = mcs7830_set_mac_address,
};

static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)
Expand Down Expand Up @@ -553,7 +553,7 @@ static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev)
return ret;
}

/* The chip always appends a status bytes that we need to strip */
/* The chip always appends a status byte that we need to strip */
static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
u8 status;
Expand Down

0 comments on commit 2ce77fc

Please sign in to comment.