RDMA/rxe: Remove VLAN code leftovers from RXE
Subsystems (2)
PATCH 1/1 RDMA/rxe: Remove VLAN code leftovers from RXE
Since the commit fd49ddaf7e26 ("RDMA/rxe: prevent rxe creation on top of vlan interface") does not permit rxe on top of vlan device, all the stuff related with vlan should be removed.
Fixes fd49ddaf7e26 ("RDMA/rxe: prevent rxe creation on top of vlan interface")
Signed-off-by Zhu Yanjun <[email protected]>
Reviewed-by Leon Romanovsky <[email protected]>
--- drivers/infiniband/sw/rxe/rxe_net.c | 9 --------- drivers/infiniband/sw/rxe/rxe_resp.c | 5 ----- 2 files changed, 0 insertions(+), 14 deletions(-)
drivers/infiniband/sw/rxe/rxe_net.c +0 -9
@@ -8,7 +8,6 @@#include <linux/if_arp.h> #include <linux/netdevice.h> #include <linux/if.h> -#include <linux/if_vlan.h> #include <net/udp_tunnel.h> #include <net/sch_generic.h> #include <linux/netfilter.h>
@@ -26,9 +25,6 @@ struct device *rxe_dma_device(struct rxe_dev *rxe) ndev = rxe->ndev; -if (is_vlan_dev (ndev)) - ndev =vlan_dev_real_dev (ndev); -return ndev->dev.parent; }
@@ -58,14 +54,9 @@ static int rxe_udp_encap_recv(struct sock *sk, struct sk_buff *skb) {struct udphdr *udph;struct net_device *ndev = skb->dev; -struct net_device *rdev = ndev;struct rxe_dev *rxe =rxe_get_dev_from_net (ndev);struct rxe_pkt_info *pkt =SKB_TO_PKT (skb); -if (!rxe &&is_vlan_dev (rdev)) { - rdev =vlan_dev_real_dev (ndev); - rxe =rxe_get_dev_from_net (rdev); - }if (!rxe) goto drop;
drivers/infiniband/sw/rxe/rxe_resp.c +0 -5
@@ -872,11 +872,6 @@ static enum resp_states do_complete(struct rxe_qp *qp,else wc->network_hdr_type =RDMA_NETWORK_IPV6 ; -if (is_vlan_dev (skb->dev)) { - wc->wc_flags |=IB_WC_WITH_VLAN ; - wc->vlan_id =vlan_dev_vlan_id (skb->dev); - } -if (pkt->mask &RXE_IMMDT_MASK ) { wc->wc_flags |=IB_WC_WITH_IMM ; wc->ex.imm_data =immdt_imm (pkt);
Signature · 1 line
1.7.1
Quoted 11 lines · Zhu Yanjun
Since the commit
fd49ddaf7e26("RDMA/rxe: prevent rxe creation on top of vlan interface") does not permit rxe on top of vlan device, all the stuff related with vlan should be removed.Fixes fd49ddaf7e26 ("RDMA/rxe: prevent rxe creation on top of vlan interface")Signed-off-by Zhu Yanjun <[email protected]>Reviewed-by Leon Romanovsky <[email protected]>--- drivers/infiniband/sw/rxe/rxe_net.c | 9 --------- drivers/infiniband/sw/rxe/rxe_resp.c | 5 ----- 2 files changed, 0 insertions(+), 14 deletions(-)
Applied to for-next, thanks
Jason