diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 12:09:19 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-05 12:09:19 +1000 |
commit | 97fb826cb510c64859f1753bac37456fd98470b5 (patch) | |
tree | ae26062b101bb57cbccba64142b5fccff6f4c570 /include | |
parent | ee52e87bb8612c947ab09abbffb0f48977b8f06b (diff) | |
parent | 32d12e8cd19f86d424cab68a29c9f09a3fe97259 (diff) |
Merge remote branch 'uwb/for-upstream'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/wlp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/wlp.h b/include/linux/wlp.h index c76fe2392506..b709ceff53f2 100644 --- a/include/linux/wlp.h +++ b/include/linux/wlp.h @@ -655,7 +655,7 @@ struct wlp { struct mutex nbmutex; /* Neighbor mutex protects neighbors list */ struct list_head neighbors; /* Elements are wlp_neighbor_e */ struct uwb_notifs_handler uwb_notifs_handler; - struct wlp_device_info *dev_info; + struct wlp_device_info *wdi; void (*fill_device_info)(struct wlp *wlp, struct wlp_device_info *info); int (*xmit_frame)(struct wlp *, struct sk_buff *, struct uwb_dev_addr *); |