aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_input.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r--net/bridge/br_input.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 5fc1c5b1c36..826cd522153 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -39,7 +39,7 @@ static int br_pass_frame_up(struct sk_buff *skb)
39 netif_receive_skb); 39 netif_receive_skb);
40} 40}
41 41
42/* note: already called with rcu_read_lock (preempt_disabled) */ 42/* note: already called with rcu_read_lock */
43int br_handle_frame_finish(struct sk_buff *skb) 43int br_handle_frame_finish(struct sk_buff *skb)
44{ 44{
45 const unsigned char *dest = eth_hdr(skb)->h_dest; 45 const unsigned char *dest = eth_hdr(skb)->h_dest;
@@ -110,7 +110,7 @@ drop:
110 goto out; 110 goto out;
111} 111}
112 112
113/* note: already called with rcu_read_lock (preempt_disabled) */ 113/* note: already called with rcu_read_lock */
114static int br_handle_local_finish(struct sk_buff *skb) 114static int br_handle_local_finish(struct sk_buff *skb)
115{ 115{
116 struct net_bridge_port *p = br_port_get_rcu(skb->dev); 116 struct net_bridge_port *p = br_port_get_rcu(skb->dev);
@@ -133,8 +133,7 @@ static inline int is_link_local(const unsigned char *dest)
133 133
134/* 134/*
135 * Return NULL if skb is handled 135 * Return NULL if skb is handled
136 * note: already called with rcu_read_lock (preempt_disabled) from 136 * note: already called with rcu_read_lock
137 * netif_receive_skb
138 */ 137 */
139struct sk_buff *br_handle_frame(struct sk_buff *skb) 138struct sk_buff *br_handle_frame(struct sk_buff *skb)
140{ 139{