lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/e1000e/hw.h
	net/bridge/br_device.c
	net/bridge/br_input.c
This commit is contained in:
David S. Miller
2010-08-02 22:22:46 -07:00
parent c477d0447d 3a3dfb062c
commit 00dad5e479
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/bridge/br_input.c
View File

@ -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)
{