diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-04 22:36:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-04 22:36:07 +0300 |
| commit | 73e84313ee4178cac628009103a901af9dfe8920 (patch) | |
| tree | 6328e1f97e4757dcf59d99e97eb2b70b352e62da /net/mac802154/ieee802154_i.h | |
| parent | e2783717a71e9babfdd7c36c7e35b790d2c01022 (diff) | |
| parent | 1add15646672ff4e7fe59bec2afcb5a0c80c5e49 (diff) | |
| download | linux-73e84313ee4178cac628009103a901af9dfe8920.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-05-04
Here's the first bluetooth-next pull request for 4.2:
- Various fixes for at86rf230 driver
- ieee802154: trace events support for rdev->ops
- HCI UART driver refactoring
- New Realtek IDs added to btusb driver
- Off-by-one fix for rtl8723b in btusb driver
- Refactoring of btbcm driver for both UART & USB use
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/ieee802154_i.h')
| -rw-r--r-- | net/mac802154/ieee802154_i.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h index bebd70ffc7a3..127ba18386fc 100644 --- a/net/mac802154/ieee802154_i.h +++ b/net/mac802154/ieee802154_i.h @@ -182,7 +182,8 @@ void ieee802154_iface_exit(void); void ieee802154_if_remove(struct ieee802154_sub_if_data *sdata); struct net_device * ieee802154_if_add(struct ieee802154_local *local, const char *name, - enum nl802154_iftype type, __le64 extended_addr); + unsigned char name_assign_type, enum nl802154_iftype type, + __le64 extended_addr); void ieee802154_remove_interfaces(struct ieee802154_local *local); #endif /* __IEEE802154_I_H */ |