forked from Minki/linux
bridge: Introduce br_send_bpdu_finish
The function dev_queue_xmit_skb_sk is unncessary and very confusing. Introduce br_send_bpdu_finish to remove the need for dev_queue_xmit_skb_sk, and have br_send_bpdu_finish call dev_queue_xmit. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f9e4306fd8
commit
1f19c578df
@ -30,6 +30,11 @@
|
|||||||
|
|
||||||
#define LLC_RESERVE sizeof(struct llc_pdu_un)
|
#define LLC_RESERVE sizeof(struct llc_pdu_un)
|
||||||
|
|
||||||
|
static int br_send_bpdu_finish(struct sock *sk, struct sk_buff *skb)
|
||||||
|
{
|
||||||
|
return dev_queue_xmit(skb);
|
||||||
|
}
|
||||||
|
|
||||||
static void br_send_bpdu(struct net_bridge_port *p,
|
static void br_send_bpdu(struct net_bridge_port *p,
|
||||||
const unsigned char *data, int length)
|
const unsigned char *data, int length)
|
||||||
{
|
{
|
||||||
@ -56,7 +61,7 @@ static void br_send_bpdu(struct net_bridge_port *p,
|
|||||||
|
|
||||||
NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, NULL, skb,
|
NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, NULL, skb,
|
||||||
NULL, skb->dev,
|
NULL, skb->dev,
|
||||||
dev_queue_xmit_sk);
|
br_send_bpdu_finish);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void br_set_ticks(unsigned char *dest, int j)
|
static inline void br_set_ticks(unsigned char *dest, int j)
|
||||||
|
Loading…
Reference in New Issue
Block a user