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>

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 5dd186d4d0e43ef4cb858cac020f449b324c7ff2..1ea978335da38b7b695ddc77b0b6b7403842d026 100644 (file)
--- 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));