From: Subash Abhinov Kasiviswanathan Date: Thu, 26 Oct 2017 17:06:47 +0000 (-0600) Subject: net: qualcomm: rmnet: Always assign rmnet dev in deaggregation path X-Git-Tag: Ubuntu-5.2.0-15.16~5558^2~277^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=85355d775ff70d9ba77a5f94dd786b23852e1c72;p=mirror_ubuntu-eoan-kernel.git 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 Signed-off-by: David S. Miller --- 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));