Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/s2io.c
This commit is contained in:
@@ -86,7 +86,10 @@ EXPORT_SYMBOL(inet_frags_fini);
|
||||
void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f)
|
||||
{
|
||||
nf->low_thresh = 0;
|
||||
|
||||
local_bh_disable();
|
||||
inet_frag_evictor(nf, f);
|
||||
local_bh_enable();
|
||||
}
|
||||
EXPORT_SYMBOL(inet_frags_exit_net);
|
||||
|
||||
|
Reference in New Issue
Block a user