diff options
| author | Johan Hovold <johan@kernel.org> | 2014-09-15 12:07:37 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-09-15 12:10:34 -0400 |
| commit | 4b7154ba70bb20a3c024faabdd2bc207b550a813 (patch) | |
| tree | 99a6e1204ec5deaca27bcbfc75ca16d3633433f2 /include/linux/netdevice.h | |
| parent | adceac14166da8c466223a35ec59c4a4adeef976 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
Merge tag 'v3.17-rc5' into usb-next
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 38377392d082..c8e388e5fccc 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -3176,7 +3176,7 @@ static inline int __dev_uc_sync(struct net_device *dev, | |||
| 3176 | } | 3176 | } |
| 3177 | 3177 | ||
| 3178 | /** | 3178 | /** |
| 3179 | * __dev_uc_unsync - Remove synchonized addresses from device | 3179 | * __dev_uc_unsync - Remove synchronized addresses from device |
| 3180 | * @dev: device to sync | 3180 | * @dev: device to sync |
| 3181 | * @unsync: function to call if address should be removed | 3181 | * @unsync: function to call if address should be removed |
| 3182 | * | 3182 | * |
| @@ -3220,7 +3220,7 @@ static inline int __dev_mc_sync(struct net_device *dev, | |||
| 3220 | } | 3220 | } |
| 3221 | 3221 | ||
| 3222 | /** | 3222 | /** |
| 3223 | * __dev_mc_unsync - Remove synchonized addresses from device | 3223 | * __dev_mc_unsync - Remove synchronized addresses from device |
| 3224 | * @dev: device to sync | 3224 | * @dev: device to sync |
| 3225 | * @unsync: function to call if address should be removed | 3225 | * @unsync: function to call if address should be removed |
| 3226 | * | 3226 | * |