aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Medhurst (Tixy)2014-04-14 23:20:49 -0500
committerDaniel Rosenberg2014-12-16 15:29:48 -0600
commit8e9fc4621b1c87a425273404ff95b36bed64946b (patch)
tree1c93dcbc0408d6e9b280f777d3ba377985d8787a
parente75c963fdb75703e09e8e2410816b582f2946126 (diff)
downloadkernel-common-p-android-3.14.tar.gz
kernel-common-p-android-3.14.tar.xz
kernel-common-p-android-3.14.zip
xt_qtaguid: Fix boot panicp-android-3.14
We need the change below because of mainline commit 351638e7de (net: pass info struct via netdevice notifier). Otherwise we panic. Change-Id: I7daf7513a733933fdcbaeebea7f8191f8b6a0432 Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--net/netfilter/xt_qtaguid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index ce41f7f7fbd..2c42067efba 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -1375,7 +1375,7 @@ unlock:
1375 1375
1376static int iface_netdev_event_handler(struct notifier_block *nb, 1376static int iface_netdev_event_handler(struct notifier_block *nb,
1377 unsigned long event, void *ptr) { 1377 unsigned long event, void *ptr) {
1378 struct net_device *dev = ptr; 1378 struct net_device *dev = netdev_notifier_info_to_dev(ptr);
1379 1379
1380 if (unlikely(module_passive)) 1380 if (unlikely(module_passive))
1381 return NOTIFY_DONE; 1381 return NOTIFY_DONE;