summaryrefslogtreecommitdiff
path: root/proto_ipv6_routing.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-08-09 12:04:49 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-08-09 12:04:49 +0200
commita2e70ae5b06ac6fa09cce3848c2ed795967b174f (patch)
tree214b9c1e15a502f4cb57939fceec371c1a970f83 /proto_ipv6_routing.c
parentaf0c1f5f89750f16054c988937e180764c411c20 (diff)
dev: Integrate `promisc' module into `dev' module
Since entering/leaving promiscuous mode also is a device specific function and all users of the `promisc' module also use `dev', integrate it there. Also rename the functions to have a `device_' prefix like the other functions in the module. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'proto_ipv6_routing.c')
0 files changed, 0 insertions, 0 deletions
843218c55a8782a6920f044d9bf6207a'>diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe: "A single fix that should go into 4.10, fixing a regression on some devices with the WRITE_SAME command" * 'for-linus' of git://git.kernel.dk/linux-block: block: don't try Write Same from __blkdev_issue_zeroout
Diffstat (limited to 'include/net/bond_alb.h')