OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 13... Line 13...
13 Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> 13 Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
14 Signed-off-by: Felix Fietkau <nbd@nbd.name> 14 Signed-off-by: Felix Fietkau <nbd@nbd.name>
Line 15... Line 15...
15   15  
16 --- a/net/bridge/br_input.c 16 --- a/net/bridge/br_input.c
17 +++ b/net/bridge/br_input.c 17 +++ b/net/bridge/br_input.c
18 @@ -239,7 +239,8 @@ static int br_handle_local_finish(struct 18 @@ -238,7 +238,8 @@ static int br_handle_local_finish(struct
19 { 19 {
Line 20... Line 20...
20 struct net_bridge_port *p = br_port_get_rcu(skb->dev); 20 struct net_bridge_port *p = br_port_get_rcu(skb->dev);
21 21
22 - __br_handle_local_finish(skb); 22 - __br_handle_local_finish(skb);
Line 23... Line 23...
23 + if (p->state != BR_STATE_DISABLED) 23 + if (p->state != BR_STATE_DISABLED)
24 + __br_handle_local_finish(skb); 24 + __br_handle_local_finish(skb);
25 25
Line 26... Line 26...
26 BR_INPUT_SKB_CB(skb)->brdev = p->br->dev; 26 BR_INPUT_SKB_CB(skb)->brdev = p->br->dev;
27 br_pass_frame_up(skb); 27 br_pass_frame_up(skb);
28 @@ -327,6 +328,15 @@ rx_handler_result_t br_handle_frame(stru 28 @@ -326,6 +327,15 @@ rx_handler_result_t br_handle_frame(stru
29 29