aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/qualcomm
diff options
context:
space:
mode:
authorGravatar Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> 2017-10-26 11:06:47 -0600
committerGravatar David S. Miller <davem@davemloft.net> 2017-10-28 00:10:23 +0900
commit85355d775ff70d9ba77a5f94dd786b23852e1c72 (patch)
tree0263c99029e743ab826fef663314b667a64f53a4 /drivers/net/ethernet/qualcomm
parentnet: qualcomm: rmnet: Fix the return value of rmnet_rx_handler() (diff)
downloadlinux-85355d775ff70d9ba77a5f94dd786b23852e1c72.tar.gz
linux-85355d775ff70d9ba77a5f94dd786b23852e1c72.tar.bz2
linux-85355d775ff70d9ba77a5f94dd786b23852e1c72.zip
net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path
The rmnet device needs to assigned for all packets in the deaggregation path based on the mux id, so the check is not needed. Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qualcomm')
-rw-r--r--drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 5dd186d4d0e4..1ea978335da3 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -83,8 +83,7 @@ __rmnet_map_ingress_handler(struct sk_buff *skb,
if (!ep)
goto free_skb;
- if (port->ingress_data_format & RMNET_INGRESS_FORMAT_DEMUXING)
- skb->dev = ep->egress_dev;
+ skb->dev = ep->egress_dev;
/* Subtract MAP header */
skb_pull(skb, sizeof(struct rmnet_map_header));