forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/intel/e1000e/netdev.c Minor conflict in e1000e, a line that got fixed in 'net' has been removed in 'net-next'. Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
335 changed files
with
2,687 additions
and
1,609 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061 | |
S: USA | ||
|
||
N: Randy Dunlap | ||
E: [email protected] | ||
W: http://www.xenotime.net/linux/linux.html | ||
W: http://www.linux-usb.org | ||
E: [email protected] | ||
W: http://www.infradead.org/~rdunlap/ | ||
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers | ||
D: x86 SMP, ACPI, bootflag hacking | ||
D: documentation, builds | ||
S: (ask for current address) | ||
S: USA | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ Supported chips: | |
Addresses scanned: - | ||
Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,9 +4,14 @@ Kernel driver adt7410 | |
Supported chips: | ||
* Analog Devices ADT7410 | ||
Prefix: 'adt7410' | ||
Addresses scanned: I2C 0x48 - 0x4B | ||
Addresses scanned: None | ||
Datasheet: Publicly available at the Analog Devices website | ||
http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf | ||
* Analog Devices ADT7420 | ||
Prefix: 'adt7420' | ||
Addresses scanned: None | ||
Datasheet: Publicly available at the Analog Devices website | ||
http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf | ||
|
||
Author: Hartmut Knaack <[email protected]> | ||
|
||
|
@@ -27,6 +32,10 @@ value per second or even justget one sample on demand for power saving. | |
Besides, it can completely power down its ADC, if power management is | ||
required. | ||
|
||
The ADT7420 is register compatible, the only differences being the package, | ||
a slightly narrower operating temperature range (-40°C to +150°C), and a | ||
better accuracy (0.25°C instead of 0.50°C.) | ||
|
||
Configuration Notes | ||
------------------- | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,7 @@ Supported chips: | |
Addresses scanned: I2C 0x18 - 0x1f | ||
|
||
Author: | ||
Guenter Roeck <[email protected]> | ||
Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ Supported devices: | |
Documentation: | ||
http://www.lineagepower.com/oem/pdf/CPLI2C.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ Supported chips: | |
Datasheet: | ||
http://www.national.com/pf/LM/LM5066.html | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,13 +5,13 @@ Supported chips: | |
* Linear Technology LTC2978 | ||
Prefix: 'ltc2978' | ||
Addresses scanned: - | ||
Datasheet: http://cds.linear.com/docs/Datasheet/2978fa.pdf | ||
Datasheet: http://www.linear.com/product/ltc2978 | ||
* Linear Technology LTC3880 | ||
Prefix: 'ltc3880' | ||
Addresses scanned: - | ||
Datasheet: http://cds.linear.com/docs/Datasheet/3880f.pdf | ||
Datasheet: http://www.linear.com/product/ltc3880 | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ Supported chips: | |
Datasheet: | ||
http://cds.linear.com/docs/Datasheet/42612fb.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ Supported chips: | |
Addresses scanned: - | ||
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ Supported chips: | |
http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf | ||
|
||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,7 +27,7 @@ Supported chips: | |
Addresses scanned: - | ||
Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ Supported chips: | |
Addresses scanned: - | ||
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX8688.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,7 +34,7 @@ Supported chips: | |
Addresses scanned: - | ||
Datasheet: n.a. | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ Supported chips: | |
http://www.summitmicro.com/prod_select/summary/SMM766/SMM766_2086.pdf | ||
http://www.summitmicro.com/prod_select/summary/SMM766B/SMM766B_2122.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Module Parameters | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,7 @@ Supported chips: | |
http://focus.ti.com/lit/ds/symlink/ucd9090.pdf | ||
http://focus.ti.com/lit/ds/symlink/ucd90910.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ Supported chips: | |
http://focus.ti.com/lit/ds/symlink/ucd9246.pdf | ||
http://focus.ti.com/lit/ds/symlink/ucd9248.pdf | ||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,7 +54,7 @@ http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146401 | |
http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256 | ||
|
||
|
||
Author: Guenter Roeck <[email protected]> | ||
Author: Guenter Roeck <[email protected]> | ||
|
||
|
||
Description | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -105,6 +105,83 @@ Copyright (C) 1999-2000 Maxim Krasnyansky <[email protected]> | |
Proto [2 bytes] | ||
Raw protocol(IP, IPv6, etc) frame. | ||
|
||
3.3 Multiqueue tuntap interface: | ||
|
||
From version 3.8, Linux supports multiqueue tuntap which can uses multiple | ||
file descriptors (queues) to parallelize packets sending or receiving. The | ||
device allocation is the same as before, and if user wants to create multiple | ||
queues, TUNSETIFF with the same device name must be called many times with | ||
IFF_MULTI_QUEUE flag. | ||
|
||
char *dev should be the name of the device, queues is the number of queues to | ||
be created, fds is used to store and return the file descriptors (queues) | ||
created to the caller. Each file descriptor were served as the interface of a | ||
queue which could be accessed by userspace. | ||
|
||
#include <linux/if.h> | ||
#include <linux/if_tun.h> | ||
|
||
int tun_alloc_mq(char *dev, int queues, int *fds) | ||
{ | ||
struct ifreq ifr; | ||
int fd, err, i; | ||
|
||
if (!dev) | ||
return -1; | ||
|
||
memset(&ifr, 0, sizeof(ifr)); | ||
/* Flags: IFF_TUN - TUN device (no Ethernet headers) | ||
* IFF_TAP - TAP device | ||
* | ||
* IFF_NO_PI - Do not provide packet information | ||
* IFF_MULTI_QUEUE - Create a queue of multiqueue device | ||
*/ | ||
ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_MULTI_QUEUE; | ||
strcpy(ifr.ifr_name, dev); | ||
|
||
for (i = 0; i < queues; i++) { | ||
if ((fd = open("/dev/net/tun", O_RDWR)) < 0) | ||
goto err; | ||
err = ioctl(fd, TUNSETIFF, (void *)&ifr); | ||
if (err) { | ||
close(fd); | ||
goto err; | ||
} | ||
fds[i] = fd; | ||
} | ||
|
||
return 0; | ||
err: | ||
for (--i; i >= 0; i--) | ||
close(fds[i]); | ||
return err; | ||
} | ||
|
||
A new ioctl(TUNSETQUEUE) were introduced to enable or disable a queue. When | ||
calling it with IFF_DETACH_QUEUE flag, the queue were disabled. And when | ||
calling it with IFF_ATTACH_QUEUE flag, the queue were enabled. The queue were | ||
enabled by default after it was created through TUNSETIFF. | ||
|
||
fd is the file descriptor (queue) that we want to enable or disable, when | ||
enable is true we enable it, otherwise we disable it | ||
|
||
#include <linux/if.h> | ||
#include <linux/if_tun.h> | ||
|
||
int tun_set_queue(int fd, int enable) | ||
{ | ||
struct ifreq ifr; | ||
|
||
memset(&ifr, 0, sizeof(ifr)); | ||
|
||
if (enable) | ||
ifr.ifr_flags = IFF_ATTACH_QUEUE; | ||
else | ||
ifr.ifr_flags = IFF_DETACH_QUEUE; | ||
|
||
return ioctl(fd, TUNSETQUEUE, (void *)&ifr); | ||
} | ||
|
||
Universal TUN/TAP device driver Frequently Asked Question. | ||
|
||
1. What platforms are supported by TUN/TAP driver ? | ||
|
Oops, something went wrong.