mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' of git://1984.lsi.us.es/net
This commit is contained in:
commit
9b461783d3
3 changed files with 5 additions and 3 deletions
|
|
@ -58,8 +58,8 @@ struct xt_set_info_target_v1 {
|
|||
struct xt_set_info_target_v2 {
|
||||
struct xt_set_info add_set;
|
||||
struct xt_set_info del_set;
|
||||
u32 flags;
|
||||
u32 timeout;
|
||||
__u32 flags;
|
||||
__u32 timeout;
|
||||
};
|
||||
|
||||
#endif /*_XT_SET_H*/
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m)
|
|||
if (likely(m != &emergency))
|
||||
kfree(m);
|
||||
else {
|
||||
xchg(&emergency_ptr, m);
|
||||
emergency_ptr = m;
|
||||
local_bh_enable();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue