diff options
| author | Kenneth Kwak <kkwak@nvidia.com> | 2014-06-24 21:40:42 -0700 |
|---|---|---|
| committer | Peter Kim <pekim@nvidia.com> | 2014-06-25 19:16:39 -0700 |
| commit | dcc66168cdb73063e95faa0e71ed55933ecee003 (patch) | |
| tree | ff4441d6b7b9ac131cb942dcace7fda716389768 /drivers | |
| parent | 8f17ce4a920155aaf51051acd8f325b1ebf904bf (diff) | |
Revert "staging: ozwpan: Add udev event to userspace."
DO NOT INTEGRATE
Bug 1466757
This reverts commit 9f19268f389d16846713471dd5914bd269e1002c.
Change-Id: I42b130e06ab5103715fdc45c955071d62dcf76f0
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/428083
Reviewed-by: Peter Kim <pekim@nvidia.com>
Tested-by: Peter Kim <pekim@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/ozwpan/ozmain.c | 2 | ||||
| -rw-r--r-- | drivers/staging/ozwpan/ozpd.c | 7 | ||||
| -rw-r--r-- | drivers/staging/ozwpan/ozproto.c | 11 |
3 files changed, 2 insertions, 18 deletions
diff --git a/drivers/staging/ozwpan/ozmain.c b/drivers/staging/ozwpan/ozmain.c index 8bb7d67da4b6..61b83f86ef63 100644 --- a/drivers/staging/ozwpan/ozmain.c +++ b/drivers/staging/ozwpan/ozmain.c @@ -51,6 +51,6 @@ module_exit(ozwpan_exit); MODULE_AUTHOR("Chris Kelly"); MODULE_DESCRIPTION("Ozmo Devices USB over WiFi hcd driver"); -MODULE_VERSION("1.2.3-rc10"); +MODULE_VERSION("1.2.3-rc9"); MODULE_LICENSE("GPL"); diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c index a99d0b49b45f..e9a3de041b8c 100644 --- a/drivers/staging/ozwpan/ozpd.c +++ b/drivers/staging/ozwpan/ozpd.c @@ -371,12 +371,6 @@ int oz_pd_sleep(struct oz_pd *pd) { int do_stop = 0; u16 stop_apps = 0; - char mac_buf[20]; - char *envp[2]; - - snprintf(mac_buf, sizeof(mac_buf), "ID_MAC=%pm", pd->mac_addr); - envp[0] = mac_buf; - envp[1] = NULL; oz_polling_lock_bh(); if (pd->state & (OZ_PD_S_SLEEP | OZ_PD_S_STOPPED)) { oz_polling_unlock_bh(); @@ -386,7 +380,6 @@ int oz_pd_sleep(struct oz_pd *pd) if (pd->keep_alive >= OZ_KALIVE_INFINITE) oz_pd_indicate_farewells(pd); oz_pd_set_state(pd, OZ_PD_S_SLEEP); - kobject_uevent_env(&g_oz_wpan_dev->kobj, KOBJ_CHANGE, envp); } else { do_stop = 1; } diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c index cbb1335f3ce1..c116e5250f6b 100644 --- a/drivers/staging/ozwpan/ozproto.c +++ b/drivers/staging/ozwpan/ozproto.c @@ -348,17 +348,8 @@ static void oz_rx_frame(struct sk_buff *skb) pd = oz_pd_find(src_addr); if (pd) { - if (!(pd->state & OZ_PD_S_CONNECTED)) { - char mac_buf[20]; - char *envp[2]; - snprintf(mac_buf, sizeof(mac_buf), "ID_MAC=%pm", - pd->mac_addr); - envp[0] = mac_buf; - envp[1] = NULL; + if (!(pd->state & OZ_PD_S_CONNECTED)) oz_pd_set_state(pd, OZ_PD_S_CONNECTED); - kobject_uevent_env(&g_oz_wpan_dev->kobj, KOBJ_CHANGE, - envp); - } getnstimeofday(¤t_time); if ((current_time.tv_sec != pd->last_rx_timestamp.tv_sec) || (pd->presleep < MSEC_PER_SEC)) { |