diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-21 04:32:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-21 04:32:26 -0400 |
| commit | e5e9743bb7429f53c83ad69b432f7b661e74c3f0 (patch) | |
| tree | db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb /drivers/net/usb | |
| parent | a0f82f64e26929776c58a5c93c2ecb38e3d82815 (diff) | |
| parent | 775d8d931581764a1ec982ebe5a927b12762fb6d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/pegasus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index a8228d87c8cf..2138535f2339 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
| @@ -899,6 +899,7 @@ static int pegasus_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
| 899 | /* cleanup should already have been scheduled */ | 899 | /* cleanup should already have been scheduled */ |
| 900 | break; | 900 | break; |
| 901 | case -ENODEV: /* disconnect() upcoming */ | 901 | case -ENODEV: /* disconnect() upcoming */ |
| 902 | case -EPERM: | ||
| 902 | netif_device_detach(pegasus->net); | 903 | netif_device_detach(pegasus->net); |
| 903 | break; | 904 | break; |
| 904 | default: | 905 | default: |