Merge "net: usb: Do not modify usbnet device context upon rx complete"
diff --git a/drivers/net/usb/rmnet_usb_data.c b/drivers/net/usb/rmnet_usb_data.c
index f9bb5c8..b0db01e 100644
--- a/drivers/net/usb/rmnet_usb_data.c
+++ b/drivers/net/usb/rmnet_usb_data.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -362,13 +362,10 @@
return skb;
}
-static __be16 rmnet_ip_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static __be16 rmnet_ip_type_trans(struct sk_buff *skb)
{
__be16 protocol = 0;
- skb->dev = dev;
-
switch (skb->data[0] & 0xf0) {
case 0x40:
protocol = htons(ETH_P_IP);
@@ -404,7 +401,6 @@
/*map urb to actual network iface based on mux id*/
unet_id = unet_offset + mux_id;
skb->dev = unet_list[unet_id]->net;
- entry->dev = unet_list[unet_id];
}
}
@@ -414,7 +410,7 @@
static int rmnet_usb_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
if (test_bit(RMNET_MODE_LLP_IP, &dev->data[0]))
- skb->protocol = rmnet_ip_type_trans(skb, dev->net);
+ skb->protocol = rmnet_ip_type_trans(skb);
else /*set zero for eth mode*/
skb->protocol = 0;