diff options
| author | Kenneth Kwak <kkwak@nvidia.com> | 2014-06-24 21:38:25 -0700 |
|---|---|---|
| committer | Peter Kim <pekim@nvidia.com> | 2014-06-25 19:15:33 -0700 |
| commit | 1143725a9b5db76dee44e2431a6e844aa7c1e056 (patch) | |
| tree | b0b0f3c8bb8849205f54ee5cf2080225c8b75a2a | |
| parent | 173c8880941f0d8ac6e57d7d7c4e5f0ce1c9ac97 (diff) | |
Revert "staging: ozwpan: add net device notifier"
DO NOT INTEGRATE
Bug 1466757
This reverts commit 14d9ab730e79a6a02f2737aaf77888d18881d322.
Change-Id: I66165659c999a60a48f615eff4de3c1c7e07bb7f
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/428078
Reviewed-by: Peter Kim <pekim@nvidia.com>
Tested-by: Peter Kim <pekim@nvidia.com>
| -rw-r--r-- | drivers/staging/ozwpan/ozproto.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c index 1066c4e49ad7..8cb25b285c6a 100644 --- a/drivers/staging/ozwpan/ozproto.c +++ b/drivers/staging/ozwpan/ozproto.c @@ -445,26 +445,6 @@ done: oz_pd_put(pd); consume_skb(skb); } - -static int oz_net_notifier(struct notifier_block *nb, unsigned long event, - void *ndev) -{ - struct net_device *dev = ndev; - switch (event) { - case NETDEV_UNREGISTER: - case NETDEV_DOWN: - oz_trace_msg(M, "%s: event %s\n", __func__, - (event == NETDEV_UNREGISTER) ? - "NETDEV_UNREGISTER" : "NETDEV_DOWN"); - oz_binding_remove(dev->name); - break; - } - return NOTIFY_OK; -} - -static struct notifier_block nb_oz_net_notifier = { - .notifier_call = oz_net_notifier -}; /*------------------------------------------------------------------------------ * Context: process */ @@ -502,7 +482,6 @@ void oz_protocol_term(void) spin_lock_bh(&g_polling_lock); } spin_unlock_bh(&g_polling_lock); - unregister_netdevice_notifier(&nb_oz_net_notifier); oz_trace("Protocol stopped\n"); } /*------------------------------------------------------------------------------ @@ -834,12 +813,6 @@ int oz_protocol_init(char *devs) return -1; } else { char d[32]; - int err = 0; - err = register_netdevice_notifier(&nb_oz_net_notifier); - if (err) { - oz_trace("notifier registration failed. err %d\n", err); - return -1; - } while (*devs) { devs = oz_get_next_device_name(devs, d, sizeof(d)); if (d[0]) |