Commit 6d0259dd authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

bridge: mcast: Rename MDB entry get function 



The current name is going to conflict with the upcoming net device
operation for the MDB get operation.

Rename the function to br_mdb_entry_skb_get(). No functional changes
intended.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62ef9cba

net/bridge/br_device.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
			goto out;

		}



		mdst = br_mdb_get(brmctx, skb, vid);

		mdst = br_mdb_entry_skb_get(brmctx, skb, vid);

		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&

		    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst))

			br_multicast_flood(mdst, skb, brmctx, false, true);

net/bridge/br_input.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 


	switch (pkt_type) {

	case BR_PKT_MULTICAST:

		mdst = br_mdb_get(brmctx, skb, vid);

		mdst = br_mdb_entry_skb_get(brmctx, skb, vid);

		if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&

		    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst)) {

			if ((mdst && mdst->host_joined) ||

net/bridge/br_multicast.c

+3 −2
Original line number Diff line number Diff line
@@ -145,8 +145,9 @@ static struct net_bridge_mdb_entry *br_mdb_ip6_get(struct net_bridge *br, 
}

#endif



struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,

					struct sk_buff *skb, u16 vid)

struct net_bridge_mdb_entry *

br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,

		     u16 vid)

{

	struct net_bridge *br = brmctx->br;

	struct br_ip ip;

net/bridge/br_private.h

+6 −4
Original line number Diff line number Diff line
@@ -955,8 +955,9 @@ int br_multicast_rcv(struct net_bridge_mcast **brmctx, 
		     struct net_bridge_mcast_port **pmctx,

		     struct net_bridge_vlan *vlan,

		     struct sk_buff *skb, u16 vid);

struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,

					struct sk_buff *skb, u16 vid);

struct net_bridge_mdb_entry *

br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,

		     u16 vid);

int br_multicast_add_port(struct net_bridge_port *port);

void br_multicast_del_port(struct net_bridge_port *port);

void br_multicast_enable_port(struct net_bridge_port *port);
@@ -1345,8 +1346,9 @@ static inline int br_multicast_rcv(struct net_bridge_mcast **brmctx, 
	return 0;

}



static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,

						      struct sk_buff *skb, u16 vid)

static inline struct net_bridge_mdb_entry *

br_mdb_entry_skb_get(struct net_bridge_mcast *brmctx, struct sk_buff *skb,

		     u16 vid)

{

	return NULL;

}