mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, as well as one instance (vxlan) of a bug fix in 'net' overlapping with code movement in 'net-next'. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
810813c47a
435 changed files with 4497 additions and 3136 deletions
|
|
@ -439,6 +439,12 @@ int dev_get_wireless_info(char *buffer, char **start, off_t offset, int length);
|
|||
/* Send a single event to user space */
|
||||
void wireless_send_event(struct net_device *dev, unsigned int cmd,
|
||||
union iwreq_data *wrqu, const char *extra);
|
||||
#ifdef CONFIG_WEXT_CORE
|
||||
/* flush all previous wext events - if work is done from netdev notifiers */
|
||||
void wireless_nlevent_flush(void);
|
||||
#else
|
||||
static inline void wireless_nlevent_flush(void) {}
|
||||
#endif
|
||||
|
||||
/* We may need a function to send a stream of events to user space.
|
||||
* More on that later... */
|
||||
|
|
|
|||
Loading…
Reference in a new issue