diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-02 22:22:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-02 22:22:46 -0700 |
| commit | 00dad5e479531e379aba7358600cc768725d4f1f (patch) | |
| tree | 652199eacee32c2cf317f5a54da8265973d29978 /net/bridge/br_input.c | |
| parent | c477d0447db08068a497e7beb892b2b2a7bff64b (diff) | |
| parent | 3a3dfb062c2e086c202d34f09ce29634515ad256 (diff) | |
| download | kernel_samsung_aries-00dad5e479531e379aba7358600cc768725d4f1f.zip kernel_samsung_aries-00dad5e479531e379aba7358600cc768725d4f1f.tar.gz kernel_samsung_aries-00dad5e479531e379aba7358600cc768725d4f1f.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/hw.h
net/bridge/br_device.c
net/bridge/br_input.c
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 5fc1c5b..826cd52 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) netif_receive_skb); } -/* note: already called with rcu_read_lock (preempt_disabled) */ +/* note: already called with rcu_read_lock */ int br_handle_frame_finish(struct sk_buff *skb) { const unsigned char *dest = eth_hdr(skb)->h_dest; @@ -110,7 +110,7 @@ drop: goto out; } -/* note: already called with rcu_read_lock (preempt_disabled) */ +/* note: already called with rcu_read_lock */ static int br_handle_local_finish(struct sk_buff *skb) { 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) /* * Return NULL if skb is handled - * note: already called with rcu_read_lock (preempt_disabled) from - * netif_receive_skb + * note: already called with rcu_read_lock */ struct sk_buff *br_handle_frame(struct sk_buff *skb) { |