diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:06:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:06:29 -0500 |
commit | cec03afcb62fbbb0eaf943f6349ade61b89d7d40 (patch) | |
tree | cc80c13e373337d1c1dee9dd7269173da1f7c079 /drivers/net/usb/usbnet.c | |
parent | 2da53b0134ad41b91556d2d2a322cc03487a1ab7 (diff) | |
parent | 4814bdbd590e835ecec2d5e505165ec1c19796b2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (173 commits)
[NETNS]: Lookup in FIB semantic hashes taking into account the namespace.
[NETNS]: Add a namespace mark to fib_info.
[IPV4]: fib_sync_down rework.
[NETNS]: Process interface address manipulation routines in the namespace.
[IPV4]: Small style cleanup of the error path in rtm_to_ifaddr.
[IPV4]: Fix memory leak on error path during FIB initialization.
[NETFILTER]: Ipv6-related xt_hashlimit compilation fix.
[NET_SCHED]: Add flow classifier
[NET_SCHED]: sch_sfq: make internal queues visible as classes
[NET_SCHED]: sch_sfq: add support for external classifiers
[NET_SCHED]: Constify struct tcf_ext_map
[BLUETOOTH]: Fix bugs in previous conn add/del workqueue changes.
[TCP]: Unexport sysctl_tcp_tso_win_divisor
[IPV4]: Make struct ipv4_devconf static.
[TR] net/802/tr.c: sysctl_tr_rif_timeout static
[XFRM]: Fix statistics.
[XFRM]: Remove unused exports.
[PKT_SCHED] sch_teql.c: Duplicate IFF_BROADCAST in FMASK, remove 2nd.
[BNX2]: Fix ASYM PAUSE advertisement for remote PHY.
[IPV4] route cache: Introduce rt_genid for smooth cache invalidation
...
Diffstat (limited to 'drivers/net/usb/usbnet.c')
-rw-r--r-- | drivers/net/usb/usbnet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 8ed1fc5cbc70..8463efb9e0b1 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -41,8 +41,7 @@ | |||
41 | #include <linux/workqueue.h> | 41 | #include <linux/workqueue.h> |
42 | #include <linux/mii.h> | 42 | #include <linux/mii.h> |
43 | #include <linux/usb.h> | 43 | #include <linux/usb.h> |
44 | 44 | #include <linux/usb/usbnet.h> | |
45 | #include "usbnet.h" | ||
46 | 45 | ||
47 | #define DRIVER_VERSION "22-Aug-2005" | 46 | #define DRIVER_VERSION "22-Aug-2005" |
48 | 47 | ||
@@ -1204,6 +1203,9 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
1204 | if ((dev->driver_info->flags & FLAG_ETHER) != 0 | 1203 | if ((dev->driver_info->flags & FLAG_ETHER) != 0 |
1205 | && (net->dev_addr [0] & 0x02) == 0) | 1204 | && (net->dev_addr [0] & 0x02) == 0) |
1206 | strcpy (net->name, "eth%d"); | 1205 | strcpy (net->name, "eth%d"); |
1206 | /* WLAN devices should always be named "wlan%d" */ | ||
1207 | if ((dev->driver_info->flags & FLAG_WLAN) != 0) | ||
1208 | strcpy(net->name, "wlan%d"); | ||
1207 | 1209 | ||
1208 | /* maybe the remote can't receive an Ethernet MTU */ | 1210 | /* maybe the remote can't receive an Ethernet MTU */ |
1209 | if (net->mtu > (dev->hard_mtu - net->hard_header_len)) | 1211 | if (net->mtu > (dev->hard_mtu - net->hard_header_len)) |