path: root/drivers/net/ethernet/qualcomm
diff options
authorTaehee Yoo <ap420073@gmail.com>2020-02-27 12:26:15 +0000
committerDavid S. Miller <davem@davemloft.net>2020-02-27 11:45:07 -0800
commitad3cc31b599ea80f06b29ebdc18b3a39878a48d6 (patch)
treebf4be7bd700ab44340fb4378717c52ca9e5f37e4 /drivers/net/ethernet/qualcomm
parentnet: rmnet: fix bridge mode bugs (diff)
net: rmnet: fix packet forwarding in rmnet bridge mode
Packet forwarding is not working in rmnet bridge mode. Because when a packet is forwarded, skb_push() for an ethernet header is needed. But it doesn't call skb_push(). So, the ethernet header will be lost. Test commands: modprobe rmnet ip netns add nst ip netns add nst2 ip link add veth0 type veth peer name veth1 ip link add veth2 type veth peer name veth3 ip link set veth1 netns nst ip link set veth3 netns nst2 ip link add rmnet0 link veth0 type rmnet mux_id 1 ip link set veth2 master rmnet0 ip link set veth0 up ip link set veth2 up ip link set rmnet0 up ip a a dev rmnet0 ip netns exec nst ip link set veth1 up ip netns exec nst ip a a dev veth1 ip netns exec nst2 ip link set veth3 up ip netns exec nst2 ip a a dev veth3 ip netns exec nst2 ping Fixes: 60d58f971c10 ("net: qualcomm: rmnet: Implement bridge mode") Signed-off-by: Taehee Yoo <ap420073@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qualcomm')
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 074a8b326c30..29a7bfa2584d 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -159,6 +159,9 @@ static int rmnet_map_egress_handler(struct sk_buff *skb,
static void
rmnet_bridge_handler(struct sk_buff *skb, struct net_device *bridge_dev)
+ if (skb_mac_header_was_set(skb))
+ skb_push(skb, skb->mac_len);
if (bridge_dev) {
skb->dev = bridge_dev;