* [PATCH net-next-2.6 1/4] be2net: Change the data type of the 'on die temperature' stat.
From: Somnath Kotur @ 2011-09-30 17:23 UTC (permalink / raw)
To: netdev, davem; +Cc: Somnath Kotur
This was showing up as junk value on PPC /Big endian machines since
it was marked as a byte.
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
---
drivers/net/ethernet/emulex/benet/be.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index c5f0516..894f1a9 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -245,7 +245,7 @@ struct be_rx_obj {
};
struct be_drv_stats {
- u8 be_on_die_temperature;
+ u32 be_on_die_temperature;
u32 tx_events;
u32 eth_red_drops;
u32 rx_drops_no_pbuf;
--
1.5.6.1
^ permalink raw reply related
* [PATCH net-next-2.6 4/4] be2net: Making die temperature ioctl call async
From: Somnath Kotur @ 2011-09-30 17:25 UTC (permalink / raw)
To: netdev, davem; +Cc: Somnath Kotur
Also changing it's frequency to once every 64s instead of existing 32s as
it was shown to affect performance
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
---
drivers/net/ethernet/emulex/benet/be.h | 5 +++
drivers/net/ethernet/emulex/benet/be_cmds.c | 40 +++++++++++++++++----------
2 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 894f1a9..644e8fe 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -137,6 +137,11 @@ static inline void *queue_tail_node(struct be_queue_info *q)
return q->dma_mem.va + q->tail * q->entry_size;
}
+static inline void *queue_index_node(struct be_queue_info *q, u16 index)
+{
+ return q->dma_mem.va + index * q->entry_size;
+}
+
static inline void queue_head_inc(struct be_queue_info *q)
{
index_inc(&q->head, q->len);
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 15949b9..38c9222 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -19,7 +19,12 @@
#include "be_cmds.h"
/* Must be a power of 2 or else MODULO will BUG_ON */
-static int be_get_temp_freq = 32;
+static int be_get_temp_freq = 64;
+
+static inline void *embedded_payload(struct be_mcc_wrb *wrb)
+{
+ return wrb->payload.embedded_payload;
+}
static void be_mcc_notify(struct be_adapter *adapter)
{
@@ -85,7 +90,20 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
be_parse_stats(adapter);
adapter->stats_cmd_sent = false;
}
+ if (compl->tag0 ==
+ OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES) {
+ struct be_mcc_wrb *mcc_wrb =
+ queue_index_node(&adapter->mcc_obj.q,
+ compl->tag1);
+ struct be_cmd_resp_get_cntl_addnl_attribs *resp =
+ embedded_payload(mcc_wrb);
+ adapter->drv_stats.be_on_die_temperature =
+ resp->on_die_temperature;
+ }
} else {
+ if (compl->tag0 == OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES)
+ be_get_temp_freq = 0;
+
if (compl_status == MCC_STATUS_NOT_SUPPORTED ||
compl_status == MCC_STATUS_ILLEGAL_REQUEST)
goto done;
@@ -404,10 +422,6 @@ int be_cmd_POST(struct be_adapter *adapter)
return -1;
}
-static inline void *embedded_payload(struct be_mcc_wrb *wrb)
-{
- return wrb->payload.embedded_payload;
-}
static inline struct be_sge *nonembedded_sgl(struct be_mcc_wrb *wrb)
{
@@ -1301,10 +1315,13 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
{
struct be_mcc_wrb *wrb;
struct be_cmd_req_get_cntl_addnl_attribs *req;
+ u16 mccq_index;
int status;
spin_lock_bh(&adapter->mcc_lock);
+ mccq_index = adapter->mcc_obj.q.head;
+
wrb = wrb_from_mccq(adapter);
if (!wrb) {
status = -EBUSY;
@@ -1318,16 +1335,9 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req));
- status = be_mcc_notify_wait(adapter);
- if (!status) {
- struct be_cmd_resp_get_cntl_addnl_attribs *resp =
- embedded_payload(wrb);
- adapter->drv_stats.be_on_die_temperature =
- resp->on_die_temperature;
- }
- /* If IOCTL fails once, do not bother issuing it again */
- else
- be_get_temp_freq = 0;
+ wrb->tag1 = mccq_index;
+
+ be_mcc_notify(adapter);
err:
spin_unlock_bh(&adapter->mcc_lock);
--
1.5.6.1
^ permalink raw reply related
* [PATCH net-next-2.6 0/4] be2net: fixes
From: Somnath Kotur @ 2011-09-30 17:22 UTC (permalink / raw)
To: netdev, davem; +Cc: Somnath Kotur
Pls apply
Somnath Kotur (4):
be2net: Change the data type of the 'on die temperature' stat.
be2net: Fixed Endianness issues in the response read log length field
while retrieving FAT data
be2net: Modified PCI MaxReadReq size to 4096 bytes
be2net: Making die temperature ioctl call async
drivers/net/ethernet/emulex/benet/be.h | 7 ++++-
drivers/net/ethernet/emulex/benet/be_cmds.c | 42 ++++++++++++++++----------
drivers/net/ethernet/emulex/benet/be_main.c | 2 +
3 files changed, 34 insertions(+), 17 deletions(-)
^ permalink raw reply
* [PATCH net-next-2.6 2/4] be2net: Fixed Endianness issues in the response read log length field while retrieving FAT data
From: Somnath Kotur @ 2011-09-30 17:24 UTC (permalink / raw)
To: netdev, davem; +Cc: Somnath Kotur
This was manifesting as a crash when FAT Dump extraction was attempted on a PPC machine.
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 4b655b8..15949b9 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1429,7 +1429,7 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
struct be_cmd_resp_get_fat *resp = get_fat_cmd.va;
memcpy(buf + offset,
resp->data_buffer,
- resp->read_log_length);
+ le32_to_cpu(resp->read_log_length));
} else {
dev_err(&adapter->pdev->dev, "FAT Table Retrieve error\n");
goto err;
--
1.5.6.1
^ permalink raw reply related
* [PATCH net-next-2.6 3/4] be2net: Modified PCI MaxReadReq size to 4096 bytes
From: Somnath Kotur @ 2011-09-30 17:24 UTC (permalink / raw)
To: netdev, davem; +Cc: Somnath Kotur
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 1a7b24c..816ce56 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2529,6 +2529,8 @@ static int be_setup(struct be_adapter *adapter)
adapter->link_speed = -1;
be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);
+
+ pcie_set_readrq(adapter->pdev, 4096);
return 0;
rx_qs_destroy:
--
1.5.6.1
^ permalink raw reply related
* [patch net-next-2.6] Repair wrong named definition aligned_u64
From: Jiří Župka @ 2011-09-30 12:09 UTC (permalink / raw)
To: netdev; +Cc: loke.chetan, davem, jpirko, Jiří Župka
This repairs problem with compile library in userspace (libnl).
Signed-off-by: Jiří Župka <jzupka@redhat.com>
---
include/linux/if_packet.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index 5e76988..f379929 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -173,7 +173,7 @@ struct tpacket_hdr_v1 {
* you can see which blk[s] is[are] outstanding etc.
* 3. Validate kernel code.
*/
- aligned_u64 seq_num;
+ __aligned_u64 seq_num;
/*
* ts_last_pkt:
--
1.7.6.4
^ permalink raw reply related
* conntrack events over netlink flood
From: Denys Fedoryshchenko @ 2011-09-30 12:15 UTC (permalink / raw)
To: netdev
Hi
After enabling events and running conntrack -E i notice flood in output
of server that have PPPoE and PPTP connections. Here is the output:
OfficeNAT ~ # conntrack -E
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[DESTROY] tcp 6 src=194.146.153.22 dst=194.146.153.20 sport=59986
dport=22 src=194.146.153.20 dst=194.146.153.22 sport=22 dport=59986
[ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
[UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
dstkey=0x0 [ASSURED]
Inside VPN there is nothing abnormal:
OfficeNAT ~ # tcpdump -ni eth1 host 192.168.0.140
tcpdump: verbose output suppressed, use -v or -vv for full protocol
decode
listening on eth1, link-type EN10MB (Ethernet), capture size 65535
bytes
15:14:25.197228 IP 192.168.0.1 > 192.168.0.140: GREv1, call 0, seq
36871343, ack 23926537, length 286: IP 10.190.197.4.8291 >
10.0.0.11.34297: Flags [P.], seq 2294356048:2294356262, ack 1493604004,
win 7176, options [nop,nop,TS val 156039405 ecr 70523361], length 214
15:14:25.197720 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926538, ack 36871342, length 84: IP 10.0.0.11 > 80.83.21.25: ICMP echo
request, id 47921, seq 62122, length 44
15:14:25.208438 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926539, ack 36871343, length 72: IP 10.0.0.11.34297 >
10.190.197.4.8291: Flags [.], ack 214, win 502, options [nop,nop,TS val
70523364 ecr 156039405], length 0
15:14:25.208455 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926540, length 80: IP 10.0.0.11 > 80.83.21.27: ICMP echo request, id
64042, seq 29149, length 44
15:14:25.208488 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926541, length 140: IP 10.0.0.11.59486 > 10.55.23.1.8291: Flags [P.],
seq 3129587623:3129587695, ack 1529616820, win 964, options [nop,nop,TS
val 70523364 ecr 1211500666], length 72
15:14:25.218655 IP 192.168.0.1 > 192.168.0.140: GREv1, call 0, seq
36871344, ack 23926541, length 112: IP 10.25.65.3 > 10.0.0.11: ICMP time
exceeded in-transit, length 72
15:14:25.219092 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926542, length 68: IP 10.0.0.11.41472 > 10.190.199.4.8291: Flags [.],
ack 937942646, win 502, options [nop,nop,TS val 70523366 ecr 510725509],
length 0
15:14:25.228513 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926543, ack 36871344, length 84: IP 10.0.0.11 > 194.146.152.54: ICMP
echo request, id 45864, seq 24534, length 44
15:14:25.228524 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926544, length 80: IP 10.0.0.11 > 194.146.152.54: ICMP echo request,
id 24373, seq 15283, length 44
15:14:25.228601 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926545, length 234: IP 10.0.0.11.49437 > 192.168.20.55.8291: Flags
[P.], seq 2487750543:2487750709, ack 830585230, win 819, options
[nop,nop,TS val 70523366 ecr 1211500747], length 166
15:14:25.233437 IP 192.168.0.1 > 192.168.0.140: GREv1, call 0, seq
36871345, ack 23926545, length 141: IP 192.168.20.55.8291 >
10.0.0.11.49437: Flags [P.], seq 1:70, ack 166, win 11700, options
[nop,nop,TS val 1211500757 ecr 70523366], length 69
15:14:25.235266 IP 192.168.0.1 > 192.168.0.140: GREv1, call 0, seq
36871346, length 173: IP 10.190.199.4.8291 > 10.0.0.11.41472: Flags
[P.], seq 1:106, ack 0, win 8424, options [nop,nop,TS val 510725517 ecr
70523366], length 105
15:14:25.235778 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, ack
36871346, no-payload, length 12
15:14:25.236650 IP 192.168.0.1 > 192.168.0.140: GREv1, call 0, seq
36871347, length 1316: IP 10.55.23.1.8291 > 10.0.0.11.59486: Flags [.],
seq 1:1249, ack 72, win 6084, options [nop,nop,TS val 1211500758 ecr
70523364], length 1248
15:14:25.236842 IP 192.168.0.1 > 192.168.0.140: GREv1, call 0, seq
36871348, length 1316: IP 10.55.23.1.8291 > 10.0.0.11.59486: Flags [.],
seq 1249:2497, ack 72, win 6084, options [nop,nop,TS val 1211500758 ecr
70523364], length 1248
15:14:25.236963 IP 192.168.0.1 > 192.168.0.140: GREv1, call 0, seq
36871349, length 1316: IP 10.55.23.1.8291 > 10.0.0.11.59486: Flags [.],
seq 2497:3745, ack 72, win 6084, options [nop,nop,TS val 1211500758 ecr
70523364], length 1248
15:14:25.237455 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, seq
23926546, length 229: IP 10.0.0.11.41472 > 10.190.199.4.8291: Flags
[P.], seq 0:161, ack 1, win 502, options [nop,nop,TS val 70523367 ecr
510725509], length 161
15:14:25.237786 IP 192.168.0.140 > 192.168.0.1: GREv1, call 3, ack
36871349, no-payload, length 12
Is it considered as a bug? I think it should not send on each packet
conntrack event.
---
System administrator
Denys Fedoryshchenko
Virtual ISP S.A.L.
^ permalink raw reply
* [RFC patch net-next-2.6] net: introduce ethernet teaming device
From: Jiri Pirko @ 2011-09-30 12:44 UTC (permalink / raw)
To: netdev
Cc: davem, eric.dumazet, bhutchings, shemminger, fubar, andy, tgraf,
ebiederm, mirqus, kaber, greearb
This patch introduces new network device called team. It supposes to be
very fast, simple, userspace-driven parallel to existing bonding device.
Userspace library called libteam with couple of demo apps is available
here:
https://github.com/jpirko/libteam
Note it's still in its dipers atm.
team<->libteam use generic netlink for communication. That and rtnl
suppose to be the only way to configure team device, no sysfs etc.
In near future python binding for libteam will be introduced. Also
daemon providing arpmon/miimon active-backup functionality will
be introduced. All what's necessary is already implemented in kernel team
driver.
Plan is to support 8023ad in near future with it's logic mainly in
userspace daemon as well.
Please review, try, comment. All feedback would be much appreciated.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
MAINTAINERS | 7 +
drivers/net/Kconfig | 15 +
drivers/net/Makefile | 1 +
drivers/net/team.c | 1783 +++++++++++++++++++++++++++++++++++++++++++++++
include/linux/Kbuild | 1 +
include/linux/if.h | 1 +
include/linux/if_team.h | 126 ++++
7 files changed, 1934 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/team.c
create mode 100644 include/linux/if_team.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 5faf685..17ad107 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6372,6 +6372,13 @@ W: http://tcp-lp-mod.sourceforge.net/
S: Maintained
F: net/ipv4/tcp_lp.c
+TEAM DRIVER
+M: Jiri Pirko <jpirko@redhat.com>
+L: netdev@vger.kernel.org
+S: Supported
+F: drivers/net/team.c
+F: include/linux/team.h
+
TEGRA SUPPORT
M: Colin Cross <ccross@android.com>
M: Erik Gilling <konkers@android.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 583f66c..0d74e9d 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -125,6 +125,21 @@ config IFB
'ifb1' etc.
Look at the iproute2 documentation directory for usage etc
+config NET_TEAM
+ tristate "Ethernet teaming support (EXPERIMENTAL)"
+ depends on EXPERIMENTAL
+ ---help---
+ This allows one to create virtual interfaces that teams together
+ multiple ethernet devices.
+
+ Team devices can be added using the "ip" command from the
+ iproute2 package:
+
+ "ip link add link [ address MAC ] [ NAME ] type team"
+
+ To compile this driver as a module, choose M here: the module
+ will be called team.
+
config MACVLAN
tristate "MAC-VLAN support (EXPERIMENTAL)"
depends on EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index fa877cd..e3d3e81 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_PHYLIB) += phy/
obj-$(CONFIG_RIONET) += rionet.o
+obj-$(CONFIG_NET_TEAM) += team.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
diff --git a/drivers/net/team.c b/drivers/net/team.c
new file mode 100644
index 0000000..3641d51
--- /dev/null
+++ b/drivers/net/team.c
@@ -0,0 +1,1783 @@
+/*
+ * net/drivers/team.c - Network team device driver
+ * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/rcupdate.h>
+#include <linux/errno.h>
+#include <linux/notifier.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/socket.h>
+#include <linux/etherdevice.h>
+#include <linux/rtnetlink.h>
+#include <net/rtnetlink.h>
+#include <net/genetlink.h>
+#include <net/netlink.h>
+#include <linux/if_team.h>
+
+#define DRV_NAME "team"
+
+
+/*************************************
+ * Structures and helpers definitions
+ *************************************/
+
+struct team;
+
+struct team_port {
+ struct net_device *dev;
+ struct hlist_node hlist; /* node in hash list */
+ struct list_head list; /* node in ordinary list */
+ struct team *team;
+ int index;
+
+ /*
+ * A place for storing original values of the device before it
+ * become a port.
+ */
+ struct {
+ unsigned char dev_addr[MAX_ADDR_LEN];
+ unsigned int mtu;
+ } orig;
+
+ bool linkup;
+ u32 speed;
+ u8 duplex;
+
+ struct rcu_head rcu;
+};
+
+struct team_mode_ops {
+ int (*init)(struct team *team);
+ void (*exit)(struct team *team);
+ rx_handler_result_t (*receive)(struct team *team,
+ struct team_port *port,
+ struct sk_buff *skb);
+ bool (*transmit)(struct team *team, struct sk_buff *skb);
+ int (*port_enter)(struct team *team, struct team_port *port);
+ void (*port_leave)(struct team *team, struct team_port *port);
+ void (*port_change_mac)(struct team *team, struct team_port *port);
+};
+
+enum team_option_type {
+ TEAM_OPTION_TYPE_U32,
+ TEAM_OPTION_TYPE_STRING,
+};
+
+struct team_option {
+ struct list_head list;
+ const char *name;
+ enum team_option_type type;
+ int (*getter)(struct team *team, void *arg);
+ int (*setter)(struct team *team, void *arg);
+};
+
+struct team_mode {
+ const char *kind;
+ const struct team_mode_ops *ops;
+};
+
+struct rr_priv {
+ unsigned int sent_packets;
+};
+
+struct ab_priv {
+ struct team_port __rcu *active_port;
+};
+
+struct team {
+ struct net_device *dev; /* associated netdevice */
+ spinlock_t lock; /* used for overall locking, e.g. port lists write */
+
+ /*
+ * port lists with port count
+ */
+ int port_count;
+ struct hlist_head *port_hlist;
+ struct list_head port_list;
+
+ struct list_head option_list;
+
+ const char *mode_kind;
+ struct team_mode_ops mode_ops;
+ union {
+ char priv_first_byte;
+ struct ab_priv ab_priv;
+ struct rr_priv rr_priv;
+ };
+};
+
+#define TEAM_PORT_HASHBITS 4
+#define TEAM_PORT_HASHENTRIES (1 << TEAM_PORT_HASHBITS)
+
+static struct hlist_head *team_port_index_hash(const struct team *team,
+ int port_index)
+{
+ return &team->port_hlist[port_index & (TEAM_PORT_HASHENTRIES - 1)];
+}
+
+static struct team_port *team_get_port_by_index_rcu(const struct team *team,
+ int port_index)
+{
+ struct hlist_node *p;
+ struct team_port *port;
+ struct hlist_head *head = team_port_index_hash(team, port_index);
+
+ hlist_for_each_entry_rcu(port, p, head, hlist)
+ if (port->index == port_index)
+ return port;
+ return NULL;
+}
+
+static bool team_port_find(const struct team *team,
+ const struct team_port *port)
+{
+ struct team_port *cur;
+
+ list_for_each_entry(cur, &team->port_list, list)
+ if (cur == port)
+ return true;
+ return false;
+}
+
+#define team_port_exists(dev) (dev->priv_flags & IFF_TEAM_PORT)
+
+static struct team_port *team_port_get_rcu(const struct net_device *dev)
+{
+ struct team_port *port = rcu_dereference(dev->rx_handler_data);
+
+ return team_port_exists(dev) ? port : NULL;
+}
+
+static struct team_port *team_port_get_rtnl(const struct net_device *dev)
+{
+ struct team_port *port = rtnl_dereference(dev->rx_handler_data);
+
+ return team_port_exists(dev) ? port : NULL;
+}
+
+/*
+ * Since the ability to change mac address for open port device is tested in
+ * team_port_add, this function can be called without control of return value
+ */
+static int __set_port_mac(struct net_device *port_dev,
+ const unsigned char *dev_addr)
+{
+ struct sockaddr addr;
+
+ memcpy(addr.sa_data, dev_addr, ETH_ALEN);
+ addr.sa_family = ARPHRD_ETHER;
+ return dev_set_mac_address(port_dev, &addr);
+}
+
+static int team_port_set_orig_mac(struct team_port *port)
+{
+ return __set_port_mac(port->dev, port->orig.dev_addr);
+}
+
+static int team_port_set_team_mac(struct team_port *port)
+{
+ return __set_port_mac(port->dev, port->team->dev->dev_addr);
+}
+
+
+/*******************
+ * Options handling
+ *******************/
+
+static void team_options_register(struct team *team,
+ struct team_option *option,
+ size_t option_count)
+{
+ int i;
+
+ for (i = 0; i < option_count; i++, option++)
+ list_add_tail(&option->list, &team->option_list);
+}
+
+static void __team_options_change_check(struct team *team,
+ struct team_option *changed_option);
+
+static void __team_options_unregister(struct team *team,
+ struct team_option *option,
+ size_t option_count)
+{
+ int i;
+
+ for (i = 0; i < option_count; i++, option++)
+ list_del(&option->list);
+}
+
+static void team_options_unregister(struct team *team,
+ struct team_option *option,
+ size_t option_count)
+{
+ __team_options_unregister(team, option, option_count);
+ __team_options_change_check(team, NULL);
+}
+
+static int team_option_get(struct team *team, struct team_option *option,
+ void *arg)
+{
+ return option->getter(team, arg);
+}
+
+static int team_option_set(struct team *team, struct team_option *option,
+ void *arg)
+{
+ int err;
+
+ err = option->setter(team, arg);
+ if (err)
+ return err;
+
+ __team_options_change_check(team, option);
+ return err;
+}
+
+/******************************
+ * Round-robin mode definition
+ ******************************/
+
+static struct team_port *__get_first_port_up(struct team *team,
+ struct team_port *port)
+{
+ struct team_port *cur;
+
+ if (port->linkup)
+ return port;
+ cur = port;
+ list_for_each_entry_continue_rcu(cur, &team->port_list, list)
+ if (cur->linkup)
+ return cur;
+ list_for_each_entry_rcu(cur, &team->port_list, list) {
+ if (cur == port)
+ break;
+ if (cur->linkup)
+ return cur;
+ }
+ return NULL;
+}
+
+static bool rr_transmit(struct team *team, struct sk_buff *skb)
+{
+ struct team_port *port;
+ int port_index;
+
+ port_index = team->rr_priv.sent_packets++ % team->port_count;
+ port = team_get_port_by_index_rcu(team, port_index);
+ port = __get_first_port_up(team, port);
+ if (unlikely(!port))
+ goto drop;
+ skb->dev = port->dev;
+ if (dev_queue_xmit(skb))
+ goto drop;
+
+ return true;
+
+drop:
+ dev_kfree_skb(skb);
+ return false;
+}
+
+static int rr_port_enter(struct team *team, struct team_port *port)
+{
+ return team_port_set_team_mac(port);
+}
+
+static void rr_port_change_mac(struct team *team, struct team_port *port)
+{
+ team_port_set_team_mac(port);
+}
+
+static const struct team_mode_ops rr_mode_ops = {
+ .transmit = rr_transmit,
+ .port_enter = rr_port_enter,
+ .port_change_mac = rr_port_change_mac,
+};
+
+static const struct team_mode rr_mode = {
+ .kind = "roundrobin",
+ .ops = &rr_mode_ops,
+};
+
+
+/********************************
+ * Active-backup mode definition
+ ********************************/
+
+static rx_handler_result_t ab_receive(struct team *team, struct team_port *port,
+ struct sk_buff *skb) {
+ struct team_port *active_port;
+
+ active_port = rcu_dereference(team->ab_priv.active_port);
+ if (active_port != port)
+ return RX_HANDLER_EXACT;
+ return RX_HANDLER_ANOTHER;
+}
+
+static bool ab_transmit(struct team *team, struct sk_buff *skb)
+{
+ struct team_port *active_port;
+
+ active_port = rcu_dereference(team->ab_priv.active_port);
+ if (unlikely(!active_port))
+ goto drop;
+ skb->dev = active_port->dev;
+ if (dev_queue_xmit(skb))
+ goto drop;
+ return true;
+
+drop:
+ dev_kfree_skb(skb);
+ return false;
+}
+
+static void ab_port_leave(struct team *team, struct team_port *port)
+{
+ if (team->ab_priv.active_port == port)
+ rcu_assign_pointer(team->ab_priv.active_port, NULL);
+}
+
+static void ab_port_change_mac(struct team *team, struct team_port *port)
+{
+ if (team->ab_priv.active_port == port)
+ team_port_set_team_mac(port);
+}
+
+static int ab_active_port_get(struct team *team, void *arg)
+{
+ u32 *ifindex = arg;
+
+ *ifindex = 0;
+ if (team->ab_priv.active_port)
+ *ifindex = team->ab_priv.active_port->dev->ifindex;
+ return 0;
+}
+
+static int ab_active_port_set(struct team *team, void *arg)
+{
+ u32 *ifindex = arg;
+ struct team_port *port;
+
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ if (port->dev->ifindex == *ifindex) {
+ struct team_port *ac_port = team->ab_priv.active_port;
+
+ /* rtnl_lock needs to be held when setting macs */
+ rtnl_lock();
+ if (ac_port)
+ team_port_set_orig_mac(ac_port);
+ rcu_assign_pointer(team->ab_priv.active_port, port);
+ team_port_set_team_mac(port);
+ rtnl_unlock();
+ return 0;
+ }
+ }
+ return -ENOENT;
+}
+
+static struct team_option ab_options[] = {
+ {
+ .name = "activeport",
+ .type = TEAM_OPTION_TYPE_U32,
+ .getter = ab_active_port_get,
+ .setter = ab_active_port_set,
+ },
+};
+
+int ab_init(struct team *team)
+{
+ team_options_register(team, ab_options, ARRAY_SIZE(ab_options));
+ return 0;
+}
+
+void ab_exit(struct team *team)
+{
+ team_options_unregister(team, ab_options, ARRAY_SIZE(ab_options));
+}
+
+static const struct team_mode_ops ab_mode_ops = {
+ .init = ab_init,
+ .exit = ab_exit,
+ .receive = ab_receive,
+ .transmit = ab_transmit,
+ .port_leave = ab_port_leave,
+ .port_change_mac = ab_port_change_mac,
+};
+
+static const struct team_mode ab_mode = {
+ .kind = "activebackup",
+ .ops = &ab_mode_ops,
+};
+
+
+/****************
+ * Mode handling
+ ****************/
+
+static const struct team_mode *team_modes[] = {
+ &rr_mode,
+ &ab_mode,
+};
+
+static const int team_mode_count = ARRAY_SIZE(team_modes);
+
+static int team_find_mode(const char *kind)
+{
+ int i;
+
+ for (i = 0; i < team_mode_count; i++) {
+ const struct team_mode *mode = team_modes[i];
+
+ if (strcmp(mode->kind, kind) == 0)
+ return i;
+ }
+ return -ENOENT;
+}
+
+/*
+ * We can benefit from the fact that it's ensured no port is present
+ * at the time of mode change.
+ */
+static void __team_change_mode(struct team *team, const int mode_index)
+{
+ const struct team_mode *mode = team_modes[mode_index];
+
+ if (team->mode_ops.exit)
+ team->mode_ops.exit(team);
+
+ if (mode_index < 0)
+ return;
+
+ memcpy(&team->mode_ops, mode->ops, sizeof(struct team_mode_ops));
+
+ /* zero private data area */
+ memset(&team->priv_first_byte, 0,
+ sizeof(struct team) - offsetof(struct team, priv_first_byte));
+
+ team->mode_kind = mode->kind;
+ if (team->mode_ops.init)
+ team->mode_ops.init(team);
+
+ return;
+}
+
+static int team_change_mode(struct team *team, const char *kind)
+{
+ int mode_index;
+ struct net_device *dev = team->dev;
+
+ if (!list_empty(&team->port_list)) {
+ netdev_err(dev, "No ports can be present during "
+ "mode change\n");
+ return -EBUSY;
+ }
+
+ if (strcmp(team->mode_kind, kind) == 0) {
+ netdev_err(dev, "Unable to change to the same mode "
+ "the team is in\n");
+ return -EINVAL;
+ }
+
+ mode_index = team_find_mode(kind);
+ if (mode_index < 0) {
+ netdev_err(dev, "Mode \"%s\" is not loaded\n", kind);
+ return -EINVAL;
+ }
+
+ __team_change_mode(team, mode_index);
+
+ netdev_info(dev, "Mode changed to \"%s\"\n", kind);
+ return 0;
+}
+
+
+/************************
+ * Rx path frame handler
+ ************************/
+
+/* note: already called with rcu_read_lock */
+static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
+{
+ struct sk_buff *skb = *pskb;
+ struct team_port *port;
+ struct team *team;
+ rx_handler_result_t res = RX_HANDLER_ANOTHER;
+
+ skb = skb_share_check(skb, GFP_ATOMIC);
+ if (!skb)
+ return RX_HANDLER_CONSUMED;
+
+ *pskb = skb;
+
+ port = team_port_get_rcu(skb->dev);
+ team = port->team;
+
+ if (team->mode_ops.receive)
+ res = team->mode_ops.receive(team, port, skb);
+
+ if (res == RX_HANDLER_ANOTHER)
+ skb->dev = team->dev;
+
+ return res;
+}
+
+
+/****************
+ * Port handling
+ ****************/
+
+static int team_port_list_init(struct team *team)
+{
+ int i;
+ struct hlist_head *hash;
+
+ hash = kmalloc(sizeof(*hash) * TEAM_PORT_HASHENTRIES, GFP_KERNEL);
+ if (hash != NULL) {
+ for (i = 0; i < TEAM_PORT_HASHENTRIES; i++)
+ INIT_HLIST_HEAD(&hash[i]);
+ } else {
+ return -ENOMEM;
+ }
+ team->port_hlist = hash;
+ INIT_LIST_HEAD(&team->port_list);
+ return 0;
+}
+
+static void team_port_list_fini(struct team *team)
+{
+ kfree(team->port_hlist);
+}
+
+/*
+ * Add/delete port to the team port list. Write guarded by rtnl_lock.
+ * Takes care of correct port->index setup (might be racy).
+ */
+static void team_port_list_add_port(struct team *team,
+ struct team_port *port)
+{
+ port->index = team->port_count++;
+ hlist_add_head_rcu(&port->hlist,
+ team_port_index_hash(team, port->index));
+ list_add_tail_rcu(&port->list, &team->port_list);
+}
+
+static void __reconstruct_port_hlist(struct team *team, int rm_index)
+{
+ int i;
+ struct team_port *port;
+
+ for (i = rm_index + 1; i < team->port_count; i++) {
+ port = team_get_port_by_index_rcu(team, i);
+ hlist_del_rcu(&port->hlist);
+ port->index--;
+ hlist_add_head_rcu(&port->hlist,
+ team_port_index_hash(team, port->index));
+ }
+}
+
+static void team_port_list_del_port(struct team *team,
+ struct team_port *port)
+{
+ int rm_index = port->index;
+
+ hlist_del_rcu(&port->hlist);
+ list_del_rcu(&port->list);
+ __reconstruct_port_hlist(team, rm_index);
+ team->port_count--;
+}
+
+static int team_port_enter(struct team *team, struct team_port *port)
+{
+ int err = 0;
+
+ dev_hold(team->dev);
+ port->dev->priv_flags |= IFF_TEAM_PORT;
+ if (team->mode_ops.port_enter) {
+ err = team->mode_ops.port_enter(team, port);
+ if (err)
+ netdev_err(team->dev, "Device %s failed to "
+ "enter team mode\n",
+ port->dev->name);
+ }
+ return err;
+}
+
+static void team_port_leave(struct team *team, struct team_port *port)
+{
+ if (team->mode_ops.port_leave)
+ team->mode_ops.port_leave(team, port);
+ port->dev->priv_flags &= ~IFF_TEAM_PORT;
+ dev_put(team->dev);
+}
+
+static void __team_port_change_check(struct team_port *port, bool linkup);
+
+static int team_port_add(struct team *team, struct net_device *port_dev)
+{
+ struct net_device *dev = team->dev;
+ struct team_port *port;
+ char *portname = port_dev->name;
+ char tmp_addr[ETH_ALEN];
+ int err;
+
+ if (port_dev->flags & IFF_LOOPBACK ||
+ port_dev->type != ARPHRD_ETHER) {
+ netdev_err(dev, "Device %s is of an unsupported type\n",
+ portname);
+ return -EINVAL;
+ }
+
+ if (team_port_exists(port_dev)) {
+ netdev_err(dev, "Device %s is already a port "
+ "of a team device\n", portname);
+ return -EBUSY;
+ }
+
+ if (port_dev->flags & IFF_UP) {
+ netdev_err(dev, "Device %s is up. Set it down before "
+ "adding it as a team port\n", portname);
+ return -EBUSY;
+ }
+
+ port = kzalloc(sizeof(struct team_port), GFP_KERNEL);
+ if (!port)
+ return -ENOMEM;
+
+ port->dev = port_dev;
+ port->team = team;
+
+ port->orig.mtu = port_dev->mtu;
+ err = dev_set_mtu(port_dev, dev->mtu);
+ if (err) {
+ netdev_dbg(dev, "Error %d calling dev_set_mtu\n", err);
+ goto err_set_mtu;
+ }
+
+ memcpy(port->orig.dev_addr, port_dev->dev_addr, ETH_ALEN);
+ random_ether_addr(tmp_addr);
+ err = __set_port_mac(port_dev, tmp_addr);
+ if (err) {
+ netdev_dbg(dev, "Device %s mac addr set failed\n",
+ portname);
+ goto err_set_mac_rand;
+ }
+
+ err = dev_open(port_dev);
+ if (err) {
+ netdev_dbg(dev, "Device %s opening failed\n",
+ portname);
+ goto err_dev_open;
+ }
+
+ err = team_port_set_orig_mac(port);
+ if (err) {
+ netdev_dbg(dev, "Device %s mac addr set failed - Device does "
+ "not support addr change when it's opened\n",
+ portname);
+ goto err_set_mac_opened;
+ }
+
+ err = team_port_enter(team, port);
+ if (err) {
+ netdev_err(dev, "Device %s failed to enter team mode\n",
+ portname);
+ goto err_port_enter;
+ }
+
+ err = netdev_set_master(port_dev, dev);
+ if (err) {
+ netdev_err(dev, "Device %s failed to set "
+ "master\n", portname);
+ goto err_set_master;
+ }
+
+ err = netdev_rx_handler_register(port_dev, team_handle_frame,
+ port);
+ if (err) {
+ netdev_err(dev, "Device %s failed to register "
+ "rx_handler\n", portname);
+ goto err_handler_register;
+ }
+
+ team_port_list_add_port(team, port);
+
+ __team_port_change_check(port, !!netif_carrier_ok(port_dev));
+
+ netdev_info(dev, "Port device %s added\n", portname);
+
+ return 0;
+
+err_handler_register:
+ netdev_set_master(port_dev, NULL);
+
+err_set_master:
+ team_port_leave(team, port);
+
+err_port_enter:
+err_set_mac_opened:
+ dev_close(port_dev);
+
+err_dev_open:
+ team_port_set_orig_mac(port);
+
+err_set_mac_rand:
+ dev_set_mtu(port_dev, port->orig.mtu);
+
+err_set_mtu:
+ kfree(port);
+
+ return err;
+}
+
+static int team_port_del(struct team *team, struct net_device *port_dev)
+{
+ struct net_device *dev = team->dev;
+ struct team_port *port;
+ char *portname = port_dev->name;
+
+ port = team_port_get_rtnl(port_dev);
+ if (!port || !team_port_find(team, port)) {
+ netdev_err(dev, "Device %s does not act as a port "
+ "of this team\n", portname);
+ return -ENOENT;
+ }
+
+ __team_port_change_check(port, false);
+ team_port_list_del_port(team, port);
+ netdev_rx_handler_unregister(port_dev);
+ netdev_set_master(port_dev, NULL);
+ team_port_leave(team, port);
+ dev_close(port_dev);
+ team_port_set_orig_mac(port);
+ dev_set_mtu(port_dev, port->orig.mtu);
+ synchronize_rcu();
+ kfree(port);
+ netdev_info(dev, "Port device %s removed\n", portname);
+
+ return 0;
+}
+
+
+/*****************
+ * Net device ops
+ ****************/
+
+static int team_mode_option_get(struct team *team, void *arg)
+{
+ const char **str = arg;
+
+ *str = team->mode_kind;
+ return 0;
+}
+
+static int team_mode_option_set(struct team *team, void *arg)
+{
+ const char **str = arg;
+
+ return team_change_mode(team, *str);
+}
+
+static struct team_option team_options[] = {
+ {
+ .name = "mode",
+ .type = TEAM_OPTION_TYPE_STRING,
+ .getter = team_mode_option_get,
+ .setter = team_mode_option_set,
+ },
+};
+
+static int team_init(struct net_device *dev)
+{
+ struct team *team = netdev_priv(dev);
+ int err;
+
+ team->dev = dev;
+ spin_lock_init(&team->lock);
+
+ err = team_port_list_init(team);
+ if (err)
+ return err;
+
+ INIT_LIST_HEAD(&team->option_list);
+ team_options_register(team, team_options, ARRAY_SIZE(team_options));
+ __team_change_mode(team, 0); /* set default mode */
+ netif_carrier_off(dev);
+
+ return 0;
+}
+
+static void team_uninit(struct net_device *dev)
+{
+ struct team *team = netdev_priv(dev);
+ struct team_port *port;
+ struct team_port *tmp;
+
+ spin_lock(&team->lock);
+ list_for_each_entry_safe(port, tmp, &team->port_list, list)
+ team_port_del(team, port->dev);
+
+ __team_change_mode(team, -1); /* cleanup */
+ __team_options_unregister(team, team_options, ARRAY_SIZE(team_options));
+ spin_unlock(&team->lock);
+}
+
+static void team_destructor(struct net_device *dev)
+{
+ struct team *team = netdev_priv(dev);
+
+ team_port_list_fini(team);
+ free_netdev(dev);
+}
+
+static int team_open(struct net_device *dev)
+{
+ netif_carrier_on(dev);
+ return 0;
+}
+
+static int team_close(struct net_device *dev)
+{
+ netif_carrier_off(dev);
+ return 0;
+}
+
+/*
+ * note: already called with rcu_read_lock
+ */
+static netdev_tx_t team_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+ struct team *team = netdev_priv(dev);
+
+ /*
+ * Ensure transmit function is called only in case there is at least
+ * one port present.
+ */
+ if (likely(!list_empty(&team->port_list)))
+ team->mode_ops.transmit(team, skb);
+
+ return NETDEV_TX_OK;
+}
+
+static void team_change_rx_flags(struct net_device *dev, int change)
+{
+ struct team *team = netdev_priv(dev);
+ struct team_port *port;
+ int inc;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ if (change & IFF_PROMISC) {
+ inc = dev->flags & IFF_PROMISC ? 1 : -1;
+ dev_set_promiscuity(port->dev, inc);
+ }
+ if (change & IFF_ALLMULTI) {
+ inc = dev->flags & IFF_ALLMULTI ? 1 : -1;
+ dev_set_allmulti(port->dev, inc);
+ }
+ }
+ rcu_read_unlock();
+}
+
+static void team_set_rx_mode(struct net_device *dev)
+{
+ struct team *team = netdev_priv(dev);
+ struct team_port *port;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ dev_uc_sync(port->dev, dev);
+ dev_mc_sync(port->dev, dev);
+ }
+ rcu_read_unlock();
+}
+
+static int team_set_mac_address(struct net_device *dev, void *p)
+{
+ struct team *team = netdev_priv(dev);
+ struct team_port *port;
+ struct sockaddr *addr = p;
+
+ memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+ rcu_read_lock();
+ list_for_each_entry_rcu(port, &team->port_list, list)
+ if (team->mode_ops.port_change_mac)
+ team->mode_ops.port_change_mac(team, port);
+ rcu_read_unlock();
+ return 0;
+}
+
+static int team_change_mtu(struct net_device *dev, int new_mtu)
+{
+ struct team *team = netdev_priv(dev);
+ struct team_port *port;
+ int err;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ err = dev_set_mtu(port->dev, new_mtu);
+ if (err) {
+ netdev_err(dev, "Device %s failed to change mtu",
+ port->dev->name);
+ goto unwind;
+ }
+ }
+ rcu_read_unlock();
+
+ dev->mtu = new_mtu;
+
+ return 0;
+
+unwind:
+ list_for_each_entry_continue_reverse(port, &team->port_list, list)
+ dev_set_mtu(port->dev, dev->mtu);
+
+ rcu_read_unlock();
+ return err;
+}
+
+static struct rtnl_link_stats64 *team_get_stats(struct net_device *dev,
+ struct rtnl_link_stats64 *stats)
+{
+ struct team *team = netdev_priv(dev);
+ struct rtnl_link_stats64 temp;
+ struct team_port *port;
+
+ memset(stats, 0, sizeof(*stats));
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ const struct rtnl_link_stats64 *pstats;
+
+ pstats = dev_get_stats(port->dev, &temp);
+
+ stats->rx_packets += pstats->rx_packets;
+ stats->rx_bytes += pstats->rx_bytes;
+ stats->rx_errors += pstats->rx_errors;
+ stats->rx_dropped += pstats->rx_dropped;
+
+ stats->tx_packets += pstats->tx_packets;
+ stats->tx_bytes += pstats->tx_bytes;
+ stats->tx_errors += pstats->tx_errors;
+ stats->tx_dropped += pstats->tx_dropped;
+
+ stats->multicast += pstats->multicast;
+ stats->collisions += pstats->collisions;
+
+ stats->rx_length_errors += pstats->rx_length_errors;
+ stats->rx_over_errors += pstats->rx_over_errors;
+ stats->rx_crc_errors += pstats->rx_crc_errors;
+ stats->rx_frame_errors += pstats->rx_frame_errors;
+ stats->rx_fifo_errors += pstats->rx_fifo_errors;
+ stats->rx_missed_errors += pstats->rx_missed_errors;
+
+ stats->tx_aborted_errors += pstats->tx_aborted_errors;
+ stats->tx_carrier_errors += pstats->tx_carrier_errors;
+ stats->tx_fifo_errors += pstats->tx_fifo_errors;
+ stats->tx_heartbeat_errors += pstats->tx_heartbeat_errors;
+ stats->tx_window_errors += pstats->tx_window_errors;
+ }
+ rcu_read_unlock();
+
+ return stats;
+}
+
+static void team_vlan_rx_add_vid(struct net_device *dev, uint16_t vid)
+{
+ struct team *team = netdev_priv(dev);
+ struct team_port *port;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ const struct net_device_ops *ops = port->dev->netdev_ops;
+
+ ops->ndo_vlan_rx_add_vid(port->dev, vid);
+ }
+ rcu_read_unlock();
+}
+
+static void team_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
+{
+ struct team *team = netdev_priv(dev);
+ struct team_port *port;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ const struct net_device_ops *ops = port->dev->netdev_ops;
+
+ ops->ndo_vlan_rx_kill_vid(port->dev, vid);
+ }
+ rcu_read_unlock();
+}
+
+static int team_add_slave(struct net_device *dev, struct net_device *port_dev)
+{
+ struct team *team = netdev_priv(dev);
+ int err;
+
+ spin_lock(&team->lock);
+ err = team_port_add(team, port_dev);
+ spin_unlock(&team->lock);
+ return err;
+}
+
+static int team_del_slave(struct net_device *dev, struct net_device *port_dev)
+{
+ struct team *team = netdev_priv(dev);
+ int err;
+
+ spin_lock(&team->lock);
+ err = team_port_del(team, port_dev);
+ spin_unlock(&team->lock);
+ return err;
+}
+
+static const struct net_device_ops team_netdev_ops = {
+ .ndo_init = team_init,
+ .ndo_uninit = team_uninit,
+ .ndo_open = team_open,
+ .ndo_stop = team_close,
+ .ndo_start_xmit = team_xmit,
+ .ndo_change_rx_flags = team_change_rx_flags,
+ .ndo_set_rx_mode = team_set_rx_mode,
+ .ndo_set_mac_address = team_set_mac_address,
+ .ndo_change_mtu = team_change_mtu,
+ .ndo_get_stats64 = team_get_stats,
+ .ndo_vlan_rx_add_vid = team_vlan_rx_add_vid,
+ .ndo_vlan_rx_kill_vid = team_vlan_rx_kill_vid,
+ .ndo_add_slave = team_add_slave,
+ .ndo_del_slave = team_del_slave,
+};
+
+
+/***********************
+ * rt netlink interface
+ ***********************/
+
+static void team_setup(struct net_device *dev)
+{
+ ether_setup(dev);
+
+ dev->netdev_ops = &team_netdev_ops;
+ dev->destructor = team_destructor;
+ dev->tx_queue_len = 0;
+ dev->flags |= IFF_MULTICAST;
+ dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
+
+ /*
+ * Indicate we support unicast address filtering. That way core won't
+ * bring us to promisc mode in case a unicast addr is added.
+ * Let this up to underlay drivers.
+ */
+ dev->priv_flags |= IFF_UNICAST_FLT;
+
+ dev->features |= NETIF_F_LLTX;
+ dev->features |= NETIF_F_GRO;
+ dev->hw_features = NETIF_F_HW_VLAN_TX |
+ NETIF_F_HW_VLAN_RX |
+ NETIF_F_HW_VLAN_FILTER;
+
+ dev->features |= dev->hw_features;
+}
+
+static int team_newlink(struct net *src_net, struct net_device *dev,
+ struct nlattr *tb[], struct nlattr *data[])
+{
+ int err;
+
+ if (tb[IFLA_ADDRESS] == NULL)
+ random_ether_addr(dev->dev_addr);
+
+ err = register_netdevice(dev);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+static int team_validate(struct nlattr *tb[], struct nlattr *data[])
+{
+ if (tb[IFLA_ADDRESS]) {
+ if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
+ return -EINVAL;
+ if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS])))
+ return -EADDRNOTAVAIL;
+ }
+ return 0;
+}
+
+static struct rtnl_link_ops team_link_ops __read_mostly = {
+ .kind = DRV_NAME,
+ .priv_size = sizeof(struct team),
+ .setup = team_setup,
+ .newlink = team_newlink,
+ .validate = team_validate,
+};
+
+
+/***********************************
+ * Generic netlink custom interface
+ ***********************************/
+
+static struct genl_family team_nl_family = {
+ .id = GENL_ID_GENERATE,
+ .name = TEAM_GENL_NAME,
+ .version = TEAM_GENL_VERSION,
+ .maxattr = TEAM_ATTR_MAX,
+ .netnsok = true,
+};
+
+static const struct nla_policy team_nl_policy[TEAM_ATTR_MAX + 1] = {
+ [TEAM_ATTR_UNSPEC] = { .type = NLA_UNSPEC, },
+ [TEAM_ATTR_TEAM_IFINDEX] = { .type = NLA_U32 },
+ [TEAM_ATTR_LIST_OPTION] = { .type = NLA_NESTED },
+ [TEAM_ATTR_LIST_MODE] = { .type = NLA_NESTED },
+ [TEAM_ATTR_LIST_PORT] = { .type = NLA_NESTED },
+};
+
+static const struct nla_policy team_nl_option_policy[TEAM_ATTR_OPTION_MAX + 1] = {
+ [TEAM_ATTR_OPTION_UNSPEC] = { .type = NLA_UNSPEC, },
+ [TEAM_ATTR_OPTION_NAME] = {
+ .type = NLA_STRING,
+ .len = TEAM_STRING_MAX_LEN,
+ },
+ [TEAM_ATTR_OPTION_CHANGED] = { .type = NLA_FLAG },
+ [TEAM_ATTR_OPTION_TYPE] = { .type = NLA_U8 },
+ [TEAM_ATTR_OPTION_DATA] = {
+ .type = NLA_BINARY,
+ .len = TEAM_STRING_MAX_LEN,
+ },
+};
+
+static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
+{
+ struct sk_buff *msg;
+ void *hdr;
+ int err;
+
+ msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+ if (!msg)
+ return -ENOMEM;
+
+ hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq,
+ &team_nl_family, 0, TEAM_CMD_NOOP);
+ if (IS_ERR(hdr)) {
+ err = PTR_ERR(hdr);
+ goto err_msg_put;
+ }
+
+ genlmsg_end(msg, hdr);
+
+ return genlmsg_unicast(genl_info_net(info), msg, info->snd_pid);
+
+err_msg_put:
+ nlmsg_free(msg);
+
+ return err;
+}
+
+/*
+ * Netlink cmd functions should be locked by following two functions.
+ * To ensure team_uninit would not be called in between, hold rcu_read_lock
+ * all the time.
+ */
+static struct team *team_nl_team_get(struct genl_info *info)
+{
+ struct net *net = genl_info_net(info);
+ int ifindex;
+ struct net_device *dev;
+ struct team *team;
+
+ if (!info->attrs[TEAM_ATTR_TEAM_IFINDEX])
+ return NULL;
+
+ ifindex = nla_get_u32(info->attrs[TEAM_ATTR_TEAM_IFINDEX]);
+ rcu_read_lock();
+ dev = dev_get_by_index_rcu(net, ifindex);
+ if (!dev || dev->netdev_ops != &team_netdev_ops) {
+ rcu_read_unlock();
+ return NULL;
+ }
+
+ team = netdev_priv(dev);
+ spin_lock(&team->lock);
+ return team;
+}
+
+static void team_nl_team_put(struct team *team)
+{
+ spin_unlock(&team->lock);
+ rcu_read_unlock();
+}
+
+static int team_nl_send_generic(struct genl_info *info, struct team *team,
+ int (*fill_func)(struct sk_buff *skb,
+ struct genl_info *info,
+ int flags, struct team *team))
+{
+ struct sk_buff *skb;
+ int err;
+
+ skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+ if (!skb)
+ return -ENOMEM;
+
+ err = fill_func(skb, info, NLM_F_ACK, team);
+ if (err < 0)
+ goto err_fill;
+
+ err = genlmsg_unicast(genl_info_net(info), skb, info->snd_pid);
+ return err;
+
+err_fill:
+ nlmsg_free(skb);
+ return err;
+}
+
+static int team_nl_fill_options_get_changed(struct sk_buff *skb,
+ u32 pid, u32 seq, int flags,
+ struct team *team,
+ struct team_option *changed_option)
+{
+ struct nlattr *option_list;
+ void *hdr;
+ struct team_option *option;
+
+ hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags,
+ TEAM_CMD_OPTIONS_GET);
+ if (IS_ERR(hdr))
+ return PTR_ERR(hdr);
+
+ NLA_PUT_U32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex);
+ option_list = nla_nest_start(skb, TEAM_ATTR_LIST_OPTION);
+ if (!option_list)
+ return -EMSGSIZE;
+
+ list_for_each_entry(option, &team->option_list, list) {
+ struct nlattr *option_item;
+ long arg;
+
+ option_item = nla_nest_start(skb, TEAM_ATTR_ITEM_OPTION);
+ if (!option_item)
+ goto nla_put_failure;
+ NLA_PUT_STRING(skb, TEAM_ATTR_OPTION_NAME, option->name);
+ if (option == changed_option)
+ NLA_PUT_FLAG(skb, TEAM_ATTR_OPTION_CHANGED);
+ switch (option->type) {
+ case TEAM_OPTION_TYPE_U32:
+ NLA_PUT_U8(skb, TEAM_ATTR_OPTION_TYPE, NLA_U32);
+ team_option_get(team, option, &arg);
+ NLA_PUT_U32(skb, TEAM_ATTR_OPTION_DATA, arg);
+ break;
+ case TEAM_OPTION_TYPE_STRING:
+ NLA_PUT_U8(skb, TEAM_ATTR_OPTION_TYPE, NLA_STRING);
+ team_option_get(team, option, &arg);
+ NLA_PUT_STRING(skb, TEAM_ATTR_OPTION_DATA, (char *) arg);
+ break;
+ default:
+ BUG();
+ }
+ nla_nest_end(skb, option_item);
+ }
+
+ nla_nest_end(skb, option_list);
+ return genlmsg_end(skb, hdr);
+
+nla_put_failure:
+ genlmsg_cancel(skb, hdr);
+ return -EMSGSIZE;
+}
+
+static int team_nl_fill_options_get(struct sk_buff *skb,
+ struct genl_info *info, int flags,
+ struct team *team)
+{
+ return team_nl_fill_options_get_changed(skb, info->snd_pid,
+ info->snd_seq, NLM_F_ACK,
+ team, NULL);
+}
+
+static int team_nl_cmd_options_get(struct sk_buff *skb, struct genl_info *info)
+{
+ struct team *team;
+ int err;
+
+ team = team_nl_team_get(info);
+ if (!team)
+ return -EINVAL;
+
+ err = team_nl_send_generic(info, team, team_nl_fill_options_get);
+
+ team_nl_team_put(team);
+
+ return err;
+}
+
+static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
+{
+ struct team *team;
+ int err = 0;
+ int i;
+ struct nlattr *nl_option;
+
+ team = team_nl_team_get(info);
+ if (!team)
+ return -EINVAL;
+
+ err = -EINVAL;
+ if (!info->attrs[TEAM_ATTR_LIST_OPTION]) {
+ err = -EINVAL;
+ goto team_put;
+ }
+
+ nla_for_each_nested(nl_option, info->attrs[TEAM_ATTR_LIST_OPTION], i) {
+ struct nlattr *mode_attrs[TEAM_ATTR_OPTION_MAX + 1];
+ enum team_option_type opt_type;
+ struct team_option *option;
+ char *opt_name;
+
+ if (nla_type(nl_option) != TEAM_ATTR_ITEM_OPTION) {
+ err = -EINVAL;
+ goto team_put;
+ }
+ err = nla_parse_nested(mode_attrs, TEAM_ATTR_OPTION_MAX,
+ nl_option, team_nl_option_policy);
+ if (err)
+ goto team_put;
+ if (!mode_attrs[TEAM_ATTR_OPTION_NAME] ||
+ !mode_attrs[TEAM_ATTR_OPTION_TYPE] ||
+ !mode_attrs[TEAM_ATTR_OPTION_DATA]) {
+ err = -EINVAL;
+ goto team_put;
+ }
+ switch (nla_get_u8(mode_attrs[TEAM_ATTR_OPTION_TYPE])) {
+ case NLA_U32:
+ opt_type = TEAM_OPTION_TYPE_U32;
+ break;
+ case NLA_STRING:
+ opt_type = TEAM_OPTION_TYPE_STRING;
+ break;
+ default:
+ goto team_put;
+ }
+
+ opt_name = nla_data(mode_attrs[TEAM_ATTR_OPTION_NAME]);
+ list_for_each_entry(option, &team->option_list, list) {
+ long arg;
+
+ if (option->type != opt_type ||
+ strcmp(option->name, opt_name))
+ continue;
+ switch (opt_type) {
+ case TEAM_OPTION_TYPE_U32:
+ arg = nla_get_u32(mode_attrs[TEAM_ATTR_OPTION_DATA]);
+ break;
+ case TEAM_OPTION_TYPE_STRING:
+ arg = (long) nla_data(mode_attrs[TEAM_ATTR_OPTION_DATA]);
+ break;
+ default:
+ BUG();
+ }
+ err = team_option_set(team, option, &arg);
+ if (err)
+ goto team_put;
+ }
+ }
+
+team_put:
+ team_nl_team_put(team);
+
+ return err;
+}
+
+static int team_nl_fill_mode_list_get(struct sk_buff *skb,
+ struct genl_info *info, int flags,
+ struct team *team)
+{
+ struct nlattr *mode_list;
+ void *hdr;
+ int i;
+
+ hdr = genlmsg_put(skb, info->snd_pid, info->snd_seq,
+ &team_nl_family, flags, TEAM_CMD_MODE_LIST_GET);
+ if (IS_ERR(hdr))
+ return PTR_ERR(hdr);
+
+ NLA_PUT_U32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex);
+ mode_list = nla_nest_start(skb, TEAM_ATTR_LIST_MODE);
+ if (!mode_list)
+ return -EMSGSIZE;
+
+ for (i = 0; i < team_mode_count; i++) {
+ const struct team_mode *mode = team_modes[i];
+ struct nlattr *mode_item;
+
+ mode_item = nla_nest_start(skb, TEAM_ATTR_ITEM_MODE);
+ if (!mode_item)
+ goto nla_put_failure;
+ NLA_PUT_STRING(skb, TEAM_ATTR_MODE_NAME, mode->kind);
+ nla_nest_end(skb, mode_item);
+ }
+
+ nla_nest_end(skb, mode_list);
+ return genlmsg_end(skb, hdr);
+
+nla_put_failure:
+ genlmsg_cancel(skb, hdr);
+ return -EMSGSIZE;
+}
+
+static int team_nl_cmd_mode_list_get(struct sk_buff *skb,
+ struct genl_info *info)
+{
+ struct team *team;
+ int err;
+
+ team = team_nl_team_get(info);
+ if (!team)
+ return -EINVAL;
+
+ err = team_nl_send_generic(info, team, team_nl_fill_mode_list_get);
+
+ team_nl_team_put(team);
+
+ return err;
+}
+
+static int team_nl_fill_port_list_get_changed(struct sk_buff *skb,
+ u32 pid, u32 seq, int flags,
+ struct team *team,
+ struct team_port *changed_port)
+{
+ struct nlattr *port_list;
+ void *hdr;
+ struct team_port *port;
+
+ hdr = genlmsg_put(skb, pid, seq, &team_nl_family, flags,
+ TEAM_CMD_PORT_LIST_GET);
+ if (IS_ERR(hdr))
+ return PTR_ERR(hdr);
+
+ NLA_PUT_U32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex);
+ port_list = nla_nest_start(skb, TEAM_ATTR_LIST_PORT);
+ if (!port_list)
+ return -EMSGSIZE;
+
+ list_for_each_entry_rcu(port, &team->port_list, list) {
+ struct nlattr *port_item;
+
+ port_item = nla_nest_start(skb, TEAM_ATTR_ITEM_MODE);
+ if (!port_item)
+ goto nla_put_failure;
+ NLA_PUT_U32(skb, TEAM_ATTR_PORT_IFINDEX, port->dev->ifindex);
+ if (port == changed_port)
+ NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_CHANGED);
+ if (port->linkup)
+ NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_LINKUP);
+ NLA_PUT_U32(skb, TEAM_ATTR_PORT_SPEED, port->speed);
+ NLA_PUT_U8(skb, TEAM_ATTR_PORT_DUPLEX, port->duplex);
+ nla_nest_end(skb, port_item);
+ }
+
+ nla_nest_end(skb, port_list);
+ return genlmsg_end(skb, hdr);
+
+nla_put_failure:
+ genlmsg_cancel(skb, hdr);
+ return -EMSGSIZE;
+}
+
+static int team_nl_fill_port_list_get(struct sk_buff *skb,
+ struct genl_info *info, int flags,
+ struct team *team)
+{
+ return team_nl_fill_port_list_get_changed(skb, info->snd_pid,
+ info->snd_seq, NLM_F_ACK,
+ team, NULL);
+}
+
+static int team_nl_cmd_port_list_get(struct sk_buff *skb,
+ struct genl_info *info)
+{
+ struct team *team;
+ int err;
+
+ team = team_nl_team_get(info);
+ if (!team)
+ return -EINVAL;
+
+ err = team_nl_send_generic(info, team, team_nl_fill_port_list_get);
+
+ team_nl_team_put(team);
+
+ return err;
+}
+
+static struct genl_ops team_nl_ops[] = {
+ {
+ .cmd = TEAM_CMD_NOOP,
+ .doit = team_nl_cmd_noop,
+ .policy = team_nl_policy,
+ },
+ {
+ .cmd = TEAM_CMD_OPTIONS_SET,
+ .doit = team_nl_cmd_options_set,
+ .policy = team_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ },
+ {
+ .cmd = TEAM_CMD_OPTIONS_GET,
+ .doit = team_nl_cmd_options_get,
+ .policy = team_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ },
+ {
+ .cmd = TEAM_CMD_MODE_LIST_GET,
+ .doit = team_nl_cmd_mode_list_get,
+ .policy = team_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ },
+ {
+ .cmd = TEAM_CMD_PORT_LIST_GET,
+ .doit = team_nl_cmd_port_list_get,
+ .policy = team_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ },
+};
+
+static struct genl_multicast_group team_change_event_mcgrp = {
+ .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME,
+};
+
+static int team_nl_send_event_options_get(struct team *team,
+ struct team_option *changed_option)
+{
+ struct sk_buff *skb;
+ int err;
+ struct net *net = dev_net(team->dev);
+
+ skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+ if (!skb)
+ return -ENOMEM;
+
+ err = team_nl_fill_options_get_changed(skb, 0, 0, 0, team,
+ changed_option);
+ if (err < 0)
+ goto err_fill;
+
+ err = genlmsg_multicast_netns(net, skb, 0, team_change_event_mcgrp.id,
+ GFP_KERNEL);
+ return err;
+
+err_fill:
+ nlmsg_free(skb);
+ return err;
+}
+
+static int team_nl_send_event_port_list_get(struct team_port *port)
+{
+ struct sk_buff *skb;
+ int err;
+ struct net *net = dev_net(port->team->dev);
+
+ skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+ if (!skb)
+ return -ENOMEM;
+
+ err = team_nl_fill_port_list_get_changed(skb, 0, 0, 0,
+ port->team, port);
+ if (err < 0)
+ goto err_fill;
+
+ err = genlmsg_multicast_netns(net, skb, 0, team_change_event_mcgrp.id,
+ GFP_KERNEL);
+ return err;
+
+err_fill:
+ nlmsg_free(skb);
+ return err;
+}
+
+static int team_nl_init(void)
+{
+ int err;
+
+ err = genl_register_family_with_ops(&team_nl_family, team_nl_ops,
+ ARRAY_SIZE(team_nl_ops));
+ if (err)
+ return err;
+
+ err = genl_register_mc_group(&team_nl_family, &team_change_event_mcgrp);
+ if (err)
+ goto err_change_event_grp_reg;
+
+ return 0;
+
+err_change_event_grp_reg:
+ genl_unregister_family(&team_nl_family);
+
+ return err;
+}
+
+static void team_nl_fini(void)
+{
+ genl_unregister_family(&team_nl_family);
+}
+
+
+/******************
+ * Change checkers
+ ******************/
+
+static void __team_options_change_check(struct team *team,
+ struct team_option *changed_option)
+{
+ int err;
+
+ err = team_nl_send_event_options_get(team, changed_option);
+ if (err)
+ netdev_warn(team->dev, "Failed to send options change "
+ "via netlink\n");
+}
+
+/* rtnl lock is held */
+static void __team_port_change_check(struct team_port *port, bool linkup)
+{
+ int err;
+
+ if (port->linkup == linkup)
+ return;
+
+ port->linkup = linkup;
+ if (linkup) {
+ struct ethtool_cmd ecmd;
+
+ err = __ethtool_get_settings(port->dev, &ecmd);
+ if (!err) {
+ port->speed = ethtool_cmd_speed(&ecmd);
+ port->duplex = ecmd.duplex;
+ goto send_event;
+ }
+ }
+ port->speed = 0;
+ port->duplex = 0;
+
+send_event:
+ err = team_nl_send_event_port_list_get(port);
+ if (err)
+ netdev_warn(port->team->dev, "Failed to send port change of "
+ "device %s via netlink\n",
+ port->dev->name);
+
+}
+
+static void team_port_change_check(struct team_port *port, bool linkup)
+{
+ struct team *team = port->team;
+
+ spin_lock(&team->lock);
+ __team_port_change_check(port, linkup);
+ spin_unlock(&team->lock);
+}
+
+/************************************
+ * Net device notifier event handler
+ ************************************/
+
+static int team_device_event(struct notifier_block *unused,
+ unsigned long event, void *ptr)
+{
+ struct net_device *dev = (struct net_device *) ptr;
+ struct team_port *port;
+
+ port = team_port_get_rtnl(dev);
+ if (!port)
+ return NOTIFY_DONE;
+
+ switch (event) {
+ case NETDEV_UP:
+ if (netif_carrier_ok(dev));
+ team_port_change_check(port, true);
+ case NETDEV_DOWN:
+ team_port_change_check(port, false);
+ case NETDEV_CHANGE:
+ if (netif_running(port->dev))
+ team_port_change_check(port,
+ !!netif_carrier_ok(port->dev));
+ break;
+ case NETDEV_UNREGISTER:
+ team_del_slave(port->team->dev, dev);
+ break;
+ case NETDEV_CHANGEMTU:
+ /* Forbid to change mtu of underlaying device */
+ return NOTIFY_BAD;
+ case NETDEV_CHANGEADDR:
+ /* Forbid to change addr of underlaying device */
+ return NOTIFY_BAD;
+ case NETDEV_PRE_TYPE_CHANGE:
+ /* Forbid to change type of underlaying device */
+ return NOTIFY_BAD;
+ }
+ return NOTIFY_DONE;
+}
+
+static struct notifier_block team_notifier_block __read_mostly = {
+ .notifier_call = team_device_event,
+};
+
+
+/***********************
+ * Module init and exit
+ ***********************/
+
+static int __init team_module_init(void)
+{
+ int err;
+
+ register_netdevice_notifier(&team_notifier_block);
+
+ err = rtnl_link_register(&team_link_ops);
+ if (err)
+ goto err_rtln_reg;
+
+ err = team_nl_init();
+ if (err)
+ goto err_nl_init;
+
+ return 0;
+
+err_nl_init:
+ rtnl_link_unregister(&team_link_ops);
+
+err_rtln_reg:
+ unregister_netdevice_notifier(&team_notifier_block);
+
+ return err;
+}
+
+static void __exit team_module_exit(void)
+{
+ team_nl_fini();
+ rtnl_link_unregister(&team_link_ops);
+ unregister_netdevice_notifier(&team_notifier_block);
+}
+
+module_init(team_module_init);
+module_exit(team_module_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Jiri Pirko <jpirko@redhat.com>");
+MODULE_DESCRIPTION("Ethernet team device driver");
+MODULE_ALIAS_RTNL_LINK(DRV_NAME);
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 619b565..0b091b3 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -185,6 +185,7 @@ header-y += if_pppol2tp.h
header-y += if_pppox.h
header-y += if_slip.h
header-y += if_strip.h
+header-y += if_team.h
header-y += if_tr.h
header-y += if_tun.h
header-y += if_tunnel.h
diff --git a/include/linux/if.h b/include/linux/if.h
index db20bd4..e98f39d 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -79,6 +79,7 @@
#define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing
* skbs on transmit */
#define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */
+#define IFF_TEAM_PORT 0x40000 /* device used as teaming port */
#define IF_GET_IFACE 0x0001 /* for querying only */
#define IF_GET_PROTO 0x0002
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
new file mode 100644
index 0000000..b451c9e
--- /dev/null
+++ b/include/linux/if_team.h
@@ -0,0 +1,126 @@
+/*
+ * include/linux/if_team.h - Network team device driver header
+ * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _LINUX_IF_TEAM_H_
+#define _LINUX_IF_TEAM_H_
+
+#define TEAM_STRING_MAX_LEN 32
+
+/**********************************
+ * NETLINK_GENERIC netlink family.
+ **********************************/
+
+enum {
+ TEAM_CMD_NOOP,
+ TEAM_CMD_OPTIONS_SET,
+ TEAM_CMD_OPTIONS_GET,
+ TEAM_CMD_MODE_LIST_GET,
+ TEAM_CMD_PORT_LIST_GET,
+
+ __TEAM_CMD_MAX,
+ TEAM_CMD_MAX = (__TEAM_CMD_MAX - 1),
+};
+
+enum {
+ TEAM_ATTR_UNSPEC,
+ TEAM_ATTR_TEAM_IFINDEX, /* u32 */
+ TEAM_ATTR_LIST_OPTION, /* nest */
+ TEAM_ATTR_LIST_MODE, /* nest */
+ TEAM_ATTR_LIST_PORT, /* nest */
+
+ __TEAM_ATTR_MAX,
+ TEAM_ATTR_MAX = __TEAM_ATTR_MAX - 1,
+};
+
+/* Nested layout of get/set msg:
+ *
+ * [TEAM_ATTR_LIST_OPTION]
+ * [TEAM_ATTR_ITEM_OPTION]
+ * [TEAM_ATTR_OPTION_*], ...
+ * [TEAM_ATTR_ITEM_OPTION]
+ * [TEAM_ATTR_OPTION_*], ...
+ * ...
+ * [TEAM_ATTR_LIST_MODE]
+ * [TEAM_ATTR_ITEM_MODE]
+ * [TEAM_ATTR_MODE_*], ...
+ * [TEAM_ATTR_ITEM_MODE]
+ * [TEAM_ATTR_MODE_*], ...
+ * ...
+ * [TEAM_ATTR_LIST_PORT]
+ * [TEAM_ATTR_ITEM_PORT]
+ * [TEAM_ATTR_PORT_*], ...
+ * [TEAM_ATTR_ITEM_PORT]
+ * [TEAM_ATTR_PORT_*], ...
+ * ...
+ */
+
+enum {
+ TEAM_ATTR_ITEM_OPTION_UNSPEC,
+ TEAM_ATTR_ITEM_OPTION, /* nest */
+
+ __TEAM_ATTR_ITEM_OPTION_MAX,
+ TEAM_ATTR_ITEM_OPTION_MAX = __TEAM_ATTR_ITEM_OPTION_MAX - 1,
+};
+
+enum {
+ TEAM_ATTR_OPTION_UNSPEC,
+ TEAM_ATTR_OPTION_NAME, /* string */
+ TEAM_ATTR_OPTION_CHANGED, /* flag */
+ TEAM_ATTR_OPTION_TYPE, /* u8 */
+ TEAM_ATTR_OPTION_DATA, /* dynamic */
+
+ __TEAM_ATTR_OPTION_MAX,
+ TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
+};
+
+enum {
+ TEAM_ATTR_ITEM_MODE_UNSPEC,
+ TEAM_ATTR_ITEM_MODE, /* nest */
+
+ __TEAM_ATTR_ITEM_MODE_MAX,
+ TEAM_ATTR_ITEM_MODE_MAX = __TEAM_ATTR_ITEM_MODE_MAX - 1,
+};
+
+enum {
+ TEAM_ATTR_MODE_UNSPEC,
+ TEAM_ATTR_MODE_NAME, /* string */
+
+ __TEAM_ATTR_MODE_MAX,
+ TEAM_ATTR_MODE_MAX = __TEAM_ATTR_MODE_MAX - 1,
+};
+
+enum {
+ TEAM_ATTR_ITEM_PORT_UNSPEC,
+ TEAM_ATTR_ITEM_PORT, /* nest */
+
+ __TEAM_ATTR_ITEM_PORT_MAX,
+ TEAM_ATTR_ITEM_PORT_MAX = __TEAM_ATTR_ITEM_PORT_MAX - 1,
+};
+
+enum {
+ TEAM_ATTR_PORT_UNSPEC,
+ TEAM_ATTR_PORT_IFINDEX, /* u32 */
+ TEAM_ATTR_PORT_CHANGED, /* flag */
+ TEAM_ATTR_PORT_LINKUP, /* flag */
+ TEAM_ATTR_PORT_SPEED, /* u32 */
+ TEAM_ATTR_PORT_DUPLEX, /* u8 */
+
+ __TEAM_ATTR_PORT_MAX,
+ TEAM_ATTR_PORT_MAX = __TEAM_ATTR_PORT_MAX - 1,
+};
+
+/*
+ * NETLINK_GENERIC related info
+ */
+#define TEAM_GENL_NAME "team"
+#define TEAM_GENL_VERSION 0x1
+#define TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME "change_event"
+
+#endif
--
1.7.6
^ permalink raw reply related
* Re: conntrack events over netlink flood
From: Florian Westphal @ 2011-09-30 12:59 UTC (permalink / raw)
To: Denys Fedoryshchenko; +Cc: netdev, netfilter-devel
In-Reply-To: <069917f11e06f3cf2e1ce9715f435b61@visp.net.lb>
Denys Fedoryshchenko <denys@visp.net.lb> wrote:
[ cc: netfilter-devel ]
> After enabling events and running conntrack -E i notice flood in output
> of server that have PPPoE and PPTP connections. Here is the output:
>
> OfficeNAT ~ # conntrack -E
> [UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
> srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
> dstkey=0x0 [ASSURED]
> [UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
> srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
> dstkey=0x0 [ASSURED]
[..]
> Is it considered as a bug? I think it should not send on each packet
> conntrack event.
Bug. Update events should only be generated when something in the
conntrack has changed (e.g. the connmark).
Could you please try this patch (untested)?
Subject: [PATCH] netfilter: conntrack_gre: only create ct assured event once
diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c
--- a/net/netfilter/nf_conntrack_proto_gre.c
+++ b/net/netfilter/nf_conntrack_proto_gre.c
@@ -241,8 +241,8 @@ static int gre_packet(struct nf_conn *ct,
nf_ct_refresh_acct(ct, ctinfo, skb,
ct->proto.gre.stream_timeout);
/* Also, more likely to be important, and not a probe. */
- set_bit(IPS_ASSURED_BIT, &ct->status);
- nf_conntrack_event_cache(IPCT_ASSURED, ct);
+ if (!test_and_set_bit(IPS_ASSURED_BIT, &ct->status))
+ nf_conntrack_event_cache(IPCT_ASSURED, ct);
} else
nf_ct_refresh_acct(ct, ctinfo, skb,
ct->proto.gre.timeout);
^ permalink raw reply
* [PATCH] mlx4_en: fix transmit of packages when blue frame is enabled
From: Thadeu Lima de Souza Cascardo @ 2011-09-30 13:23 UTC (permalink / raw)
To: netdev; +Cc: Thadeu Lima de Souza Cascardo, Yevgeny Petrilin
With the addition of Blue Frame support in the network driver for mlx4,
the doorbell is not written in the path where blue frame is enabled and
the package follows some characteristics.
The consequence of that is that ICMP ECHO requests, for example, were
not transmitted by the device. A ping flood, for example, would make the
watchdog dispatch, because the ring was full and transmissions have
timed out.
After this fix, I could ping two systems using mlx4_en (both with the
fix).
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Cc: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
---
drivers/net/ethernet/mellanox/mlx4/en_tx.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 6e03de0..270da80 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -811,10 +811,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
* before setting ownership of this descriptor to HW */
wmb();
tx_desc->ctrl.owner_opcode = op_own;
- wmb();
- writel(ring->doorbell_qpn, ring->bf.uar->map + MLX4_SEND_DOORBELL);
}
+ wmb();
+ writel(ring->doorbell_qpn, ring->bf.uar->map + MLX4_SEND_DOORBELL);
+
/* Poll CQ here */
mlx4_en_xmit_poll(priv, tx_ind);
--
1.7.4.4
^ permalink raw reply related
* Re: conntrack events over netlink flood
From: Denys Fedoryshchenko @ 2011-09-30 13:46 UTC (permalink / raw)
To: Florian Westphal; +Cc: netdev, netfilter-devel
In-Reply-To: <20110930125956.GD13047@Chamillionaire.breakpoint.cc>
On Fri, 30 Sep 2011 14:59:56 +0200, Florian Westphal wrote:
> Denys Fedoryshchenko <denys@visp.net.lb> wrote:
>
> [ cc: netfilter-devel ]
>
>> After enabling events and running conntrack -E i notice flood in
>> output
>> of server that have PPPoE and PPTP connections. Here is the output:
>>
>> OfficeNAT ~ # conntrack -E
>> [UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
>> srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
>> dstkey=0x0 [ASSURED]
>> [UPDATE] gre 47 17999 src=192.168.0.140 dst=192.168.0.1
>> srckey=0x0 dstkey=0x3 src=192.168.0.1 dst=192.168.0.140 srckey=0x3
>> dstkey=0x0 [ASSURED]
>
> [..]
>
>> Is it considered as a bug? I think it should not send on each
>> packet
>> conntrack event.
>
> Bug. Update events should only be generated when something in the
> conntrack has changed (e.g. the connmark).
>
> Could you please try this patch (untested)?
>
> Subject: [PATCH] netfilter: conntrack_gre: only create ct assured
> event once
>
> diff --git a/net/netfilter/nf_conntrack_proto_gre.c
> b/net/netfilter/nf_conntrack_proto_gre.c
> --- a/net/netfilter/nf_conntrack_proto_gre.c
> +++ b/net/netfilter/nf_conntrack_proto_gre.c
> @@ -241,8 +241,8 @@ static int gre_packet(struct nf_conn *ct,
> nf_ct_refresh_acct(ct, ctinfo, skb,
> ct->proto.gre.stream_timeout);
> /* Also, more likely to be important, and not a probe. */
> - set_bit(IPS_ASSURED_BIT, &ct->status);
> - nf_conntrack_event_cache(IPCT_ASSURED, ct);
> + if (!test_and_set_bit(IPS_ASSURED_BIT, &ct->status))
> + nf_conntrack_event_cache(IPCT_ASSURED, ct);
> } else
> nf_ct_refresh_acct(ct, ctinfo, skb,
> ct->proto.gre.timeout);
Fine now, patch fixed this bug.
Tested-by: Denys Fedoryshchenko <denys@visp.net.lb>
---
System administrator
Denys Fedoryshchenko
Virtual ISP S.A.L.
^ permalink raw reply
* Re: [net-next 11/11] ixgbe: allow eeprom writes via ethtool
From: Ben Hutchings @ 2011-09-30 13:52 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, Emil Tantilov, netdev, gospo
In-Reply-To: <1317360291-5576-12-git-send-email-jeffrey.t.kirsher@intel.com>
On Thu, 2011-09-29 at 22:24 -0700, Jeff Kirsher wrote:
[...]
> +static int ixgbe_set_eeprom(struct net_device *netdev,
> + struct ethtool_eeprom *eeprom, u8 *bytes)
> +{
> + struct ixgbe_adapter *adapter = netdev_priv(netdev);
> + struct ixgbe_hw *hw = &adapter->hw;
> + u16 *eeprom_buff;
> + void *ptr;
> + int max_len, first_word, last_word, ret_val = 0;
> + u16 i;
> +
> + if (eeprom->len == 0)
> + return -EOPNOTSUPP;
> +
> + if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
> + return -EFAULT;
[...]
Both these error codes should be EINVAL.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH next 2/7] 8139cp : removal of headers.
From: Ben Hutchings @ 2011-09-30 14:03 UTC (permalink / raw)
To: Francois Romieu; +Cc: davem, netdev
In-Reply-To: <20110930103719.GC26727@electric-eye.fr.zoreil.com>
On Fri, 2011-09-30 at 12:37 +0200, Francois Romieu wrote:
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> ---
> drivers/net/ethernet/realtek/8139cp.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
> index c77d5af..60c8de5 100644
> --- a/drivers/net/ethernet/realtek/8139cp.c
> +++ b/drivers/net/ethernet/realtek/8139cp.c
> @@ -55,8 +55,6 @@
>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> -#include <linux/kernel.h>
Needed for container_of.
> -#include <linux/compiler.h>
Needed for __packed. But it's probably safe to assume that
<linux/kernel.h> will include it.
> #include <linux/netdevice.h>
> #include <linux/etherdevice.h>
> #include <linux/init.h>
> @@ -65,7 +63,6 @@
> #include <linux/dma-mapping.h>
> #include <linux/delay.h>
> #include <linux/ethtool.h>
> -#include <linux/gfp.h>
Needed for GFP_KERNEL.
> #include <linux/mii.h>
> #include <linux/if_vlan.h>
> #include <linux/crc32.h>
> @@ -73,10 +70,8 @@
> #include <linux/ip.h>
> #include <linux/tcp.h>
> #include <linux/udp.h>
> -#include <linux/cache.h>
Needed for ____cacheline_aligned.
> #include <asm/io.h>
> #include <asm/irq.h>
> -#include <asm/uaccess.h>
>
> /* These identify the driver base version and may not be removed. */
> static char version[] =
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: Network problem with bridge and virtualbox
From: William Thompson @ 2011-09-30 14:36 UTC (permalink / raw)
To: Nicolas de Peslo?an; +Cc: netdev
In-Reply-To: <4E84E9A7.4080008@gmail.com>
On Thu, Sep 29, 2011 at 11:56:55PM +0200, Nicolas de Peslo?an wrote:
> Le 29/09/2011 14:49, William Thompson a ?crit :
> >Please keep me in the CC as I am not subscribed.
> >
> >I'm using a 64-bit kernel 3.0.0 and virtualbox 4.1.2.
> >
> >My problem is that I cannot ping the host from a virtual machine.
> >
> >My bridge is configured as follows:
> ># brctl addbr br0
> ># brctl setfd br0 0
> ># brctl stp br0 off
> ># ifconfig br0 10.2.3.1 netmask 255.255.255.0
> >
> >In the virtual machine, it is set to use br0 as it's interface (bridge mode)
> >and it's IP is 10.2.3.10.
>
> Why do you use bridge with VirtualBox?
>
> VirtualBox provide several network modes, which remove the need for bridge on the host.
>
> One of Bridged Network mode (using eth0), Internal Networking mode
> or Host-only Networking mode may suit your need well, without having
> to use a bridge.
I originally set this up as a hostonly (and routed) network. The bridge has
no other interfaces added to it. I know virtualbox has hostonly builtin, but
I did not want to use it's limited DHCP server and this was the only solution
I came up with at the time. Due to the way the vboxnet interfaces are
dynamically created, I didn't have a way at the time to start programs on
that interface when it came up.
^ permalink raw reply
* Re: [PATCH] Fix repeatable Oops on container destroy with conntrack
From: Alex Bligh @ 2011-09-30 15:54 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Alexey Dobriyan, netfilter-devel, linux-kernel, containers,
Linux Containers, netdev, Alex Bligh
In-Reply-To: <20110928210851.GA2761@1984>
--On 28 September 2011 23:08:51 +0200 Pablo Neira Ayuso
<pablo@netfilter.org> wrote:
>> As you can probably tell, my interest here is to get something that
>> doesn't oops into stable kernels.
>
> As said, I'm not sure that this can happen, given that the amount of
> patches that we need to fix it fine, sorry.
This is why I was suggesting the 2 line "don't oops" patch in the
interim.
--
Alex Bligh
^ permalink raw reply
* Re: [RFC patch net-next-2.6] net: introduce ethernet teaming device
From: Stephen Hemminger @ 2011-09-30 16:26 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, davem, eric.dumazet, bhutchings, fubar, andy, tgraf,
ebiederm, mirqus, kaber, greearb
In-Reply-To: <1317386643-3041-1-git-send-email-jpirko@redhat.com>
On Fri, 30 Sep 2011 14:44:03 +0200
Jiri Pirko <jpirko@redhat.com> wrote:
> +static struct rtnl_link_stats64 *team_get_stats(struct net_device *dev,
> + struct rtnl_link_stats64 *stats)
> +{
> + struct team *team = netdev_priv(dev);
> + struct rtnl_link_stats64 temp;
> + struct team_port *port;
> +
> + memset(stats, 0, sizeof(*stats));
> +
> + rcu_read_lock();
> + list_for_each_entry_rcu(port, &team->port_list, list) {
> + const struct rtnl_link_stats64 *pstats;
You need to use u64_stats_sync macros to make this safe on 32 bit
mode.
Also, I am not sure about the handling of speed and duplex.
There are people who do active backup with links of different speeds.
The team device doesn't seem to handle hardware offload features
as completely as it should. The TSO and transmit checksumming should
be the union of the teamed ports.
^ permalink raw reply
* Re: [PATCH next 2/7] 8139cp : removal of headers.
From: Francois Romieu @ 2011-09-30 16:26 UTC (permalink / raw)
To: Ben Hutchings; +Cc: davem, netdev
In-Reply-To: <1317391428.4068.36.camel@deadeye>
Ben Hutchings <bhutchings@solarflare.com> :
[...]
> > diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
> > index c77d5af..60c8de5 100644
> > --- a/drivers/net/ethernet/realtek/8139cp.c
> > +++ b/drivers/net/ethernet/realtek/8139cp.c
> > @@ -55,8 +55,6 @@
> >
> > #include <linux/module.h>
> > #include <linux/moduleparam.h>
> > -#include <linux/kernel.h>
>
> Needed for container_of.
>
> > -#include <linux/compiler.h>
>
> Needed for __packed. But it's probably safe to assume that
> <linux/kernel.h> will include it.
<linux/module.h> would include it too.
Being modular opens the doors for a lot of features. :o|
[...]
> > @@ -65,7 +63,6 @@
> > #include <linux/dma-mapping.h>
> > #include <linux/delay.h>
> > #include <linux/ethtool.h>
> > -#include <linux/gfp.h>
>
> Needed for GFP_KERNEL.
I would have assumed that <linux/dma-mapping.h> provides it as it
publicizes gfp_t dependant data.
I am sceptical about the value in including so much headers for
rather common things at the network device driver level. After all
the code is supposed to be cross-platform, modular or monolithic
built.
I can understand that even a single class of devices requires some
variation but including kernel.h, init.h, module.h and moduleparam.h
all around in drivers/net seems a bit silly. Same thing for including
both netdevice.h and etherdevice.h.
It's probably not worth the hassle. I'll drop it.
--
Ueimor
^ permalink raw reply
* Re: [PATCH net-next] tcp: report ECN_SEEN in tcp_info
From: Stephen Hemminger @ 2011-09-30 16:29 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David Miller, netdev
In-Reply-To: <1317357897.3274.11.camel@edumazet-laptop>
On Fri, 30 Sep 2011 06:44:57 +0200
Eric Dumazet <eric.dumazet@gmail.com> wrote:
> Stephen are you planning to provide an alternative git tree for
> iproute2 ? Thanks !
It is on github for now.
git clone git://github.com/shemminger/iproute2.git
^ permalink raw reply
* [PATCH] net: xen-netback: correctly restart Tx after a VM restore/migrate
From: David Vrabel @ 2011-09-30 16:37 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, xen-devel, David Vrabel, Ian Campbell
If a VM is saved and restored (or migrated) the netback driver will no
longer process any Tx packets from the frontend. xenvif_up() does not
schedule the processing of any pending Tx requests from the front end
because the carrier is off. Without this initial kick the frontend
just adds Tx requests to the ring without raising an event (until the
ring is full).
This was caused by 47103041e91794acdbc6165da0ae288d844c820b (net:
xen-netback: convert to hw_features) which reordered the calls to
xenvif_up() and netif_carrier_on() in xenvif_connect().
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
---
drivers/net/xen-netback/interface.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 0ca86f9..1825629 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -327,12 +327,12 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
xenvif_get(vif);
rtnl_lock();
- if (netif_running(vif->dev))
- xenvif_up(vif);
if (!vif->can_sg && vif->dev->mtu > ETH_DATA_LEN)
dev_set_mtu(vif->dev, ETH_DATA_LEN);
netdev_update_features(vif->dev);
netif_carrier_on(vif->dev);
+ if (netif_running(vif->dev))
+ xenvif_up(vif);
rtnl_unlock();
return 0;
--
1.7.2.5
^ permalink raw reply related
* Re: [PATCH] net: xen-netback: correctly restart Tx after a VM restore/migrate
From: Ian Campbell @ 2011-09-30 16:45 UTC (permalink / raw)
To: David Vrabel
Cc: netdev@vger.kernel.org, xen-devel@lists.xensource.com,
David S. Miller
In-Reply-To: <1317400671-21236-1-git-send-email-david.vrabel@citrix.com>
On Fri, 2011-09-30 at 17:37 +0100, David Vrabel wrote:
> If a VM is saved and restored (or migrated) the netback driver will no
> longer process any Tx packets from the frontend. xenvif_up() does not
> schedule the processing of any pending Tx requests from the front end
> because the carrier is off. Without this initial kick the frontend
> just adds Tx requests to the ring without raising an event (until the
> ring is full).
>
> This was caused by 47103041e91794acdbc6165da0ae288d844c820b (net:
> xen-netback: convert to hw_features) which reordered the calls to
> xenvif_up() and netif_carrier_on() in xenvif_connect().
Ah, so the bit of that patch which moved "netif_carrier_on(vif->dev);"
should have actually moved the entire block
netif_carrier_on(vif->dev);
if (netif_running(vif->dev))
xenvif_up(vif);
Since it it is logically a single thing. Make sense. Thanks!
> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Ian.
> ---
> drivers/net/xen-netback/interface.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
> index 0ca86f9..1825629 100644
> --- a/drivers/net/xen-netback/interface.c
> +++ b/drivers/net/xen-netback/interface.c
> @@ -327,12 +327,12 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
> xenvif_get(vif);
>
> rtnl_lock();
> - if (netif_running(vif->dev))
> - xenvif_up(vif);
> if (!vif->can_sg && vif->dev->mtu > ETH_DATA_LEN)
> dev_set_mtu(vif->dev, ETH_DATA_LEN);
> netdev_update_features(vif->dev);
> netif_carrier_on(vif->dev);
> + if (netif_running(vif->dev))
> + xenvif_up(vif);
> rtnl_unlock();
>
> return 0;
^ permalink raw reply
* Re: [PATCH next 2/7] 8139cp : removal of headers.
From: David Miller @ 2011-09-30 18:13 UTC (permalink / raw)
To: romieu; +Cc: bhutchings, netdev
In-Reply-To: <20110930162649.GA32195@electric-eye.fr.zoreil.com>
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 30 Sep 2011 18:26:49 +0200
> I am sceptical about the value in including so much headers for
> rather common things at the network device driver level. After all
> the code is supposed to be cross-platform, modular or monolithic
> built.
We are trying very hard to split out the implicit inclusions of
one set of headers into another.
So you absolutely should always include the headers for all features
you explicitly use.
^ permalink raw reply
* Re: [net-next 00/11][pull request] Intel Wired LAN Driver Updates
From: Jeff Kirsher @ 2011-09-30 18:35 UTC (permalink / raw)
To: davem@davemloft.net; +Cc: netdev@vger.kernel.org, gospo@redhat.com
In-Reply-To: <1317360291-5576-1-git-send-email-jeffrey.t.kirsher@intel.com>
[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]
On Thu, 2011-09-29 at 22:24 -0700, Kirsher, Jeffrey T wrote:
> The following series contains updates to e1000e and ixgbe. The one
> patch for e1000e makes function tables const, thanks to Stephen
> Hemminger for reporting this. The remaining patches are for ixgbe,
> and the contain the following:
>
> - minor cleanups
> - add support for 82599 device and ethtool -E support
> - removal of a PHY which is not used in production silicon
>
> The following are changes since commit 56fd49e399ce1d82200fad5b8924d4e35a587809:
> bna: Driver Version changed to 3.0.2.2
> and are available in the git repository at
> git://github.com/Jkirsher/net-next.git
>
> Emil Tantilov (8):
> ixgbe: prevent link checks while resetting
> ixgbe: clear the data field in ixgbe_read_i2c_byte_generic
> ixgbe: remove return code for functions that always return 0
> ixgbe: add support for new 82599 device
> ixgbe: send MFLCN to ethtool
> ixgbe: do not disable flow control in ixgbe_check_mac_link
> ixgbe: remove instances of ixgbe_phy_aq for 82598 and 82599
> ixgbe: allow eeprom writes via ethtool
>
> Jacob Keller (1):
> ixgbe: fix driver version initialization in firmware
>
> Jeff Kirsher (1):
> e1000e: make function tables const
>
> Mika Lansirinne (1):
> ixgbe: get pauseparam autoneg
>
> drivers/net/ethernet/intel/e1000e/80003es2lan.c | 8 +-
> drivers/net/ethernet/intel/e1000e/82571.c | 20 +++---
> drivers/net/ethernet/intel/e1000e/e1000.h | 28 ++++----
> drivers/net/ethernet/intel/e1000e/ich8lan.c | 16 +++---
> drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 8 +--
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 7 +--
> drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 6 --
> drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 74 +++++++++++++++++++---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 +++-
> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++-------
> drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
> drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 +
> 12 files changed, 125 insertions(+), 89 deletions(-)
>
Currently there is only 1 small change that needs to be made to patch 11
of the series, based on Ben's comments.
I will wait a bit longer before fixing up patch 11, to ensure that there
are no other changes needed.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* pull request: wireless-next 2011-09-30
From: John W. Linville @ 2011-09-30 19:11 UTC (permalink / raw)
To: davem; +Cc: linux-wireless, netdev
Dave,
Here is yet another big package of wireless updates for 3.2. Highlights
include a bluetooth pull, a wl12xx pull, and a pull of the wireless tree
to fix some merge issues. Also included is the usual big sets of
updates to ath9k, iwlagn, b43, and others. Plus, the NFC subsystem grew
NCI support.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 56fd49e399ce1d82200fad5b8924d4e35a587809:
bna: Driver Version changed to 3.0.2.2 (2011-09-29 19:36:36 -0400)
are available in the git repository at:
git://git.infradead.org/users/linville/wireless-next.git for-davem
Alexander Simon (1):
mac80211: fix indentation
Amit Beka (1):
iwlagn: remove duplicate list init
Amitkumar Karwar (4):
mwifiex: fix 5GHz association issue
mwifiex: update bss band information
mwifiex: pass correct band parameter to ieee80211_channel_to_frequency()
mwifiex: reset skb length before inserting to free queue
Anderson Briglia (1):
Bluetooth: Fix wrong memcpy size on LE start encryption
Andre Guedes (2):
Bluetooth: Reduce critical region.
Bluetooth: Check 'dev_class' in mgmt_device_found()
Antti Julku (2):
Bluetooth: Add mgmt command for fast connectable mode
Bluetooth: Add mgmt events for blacklisting
Arik Nemtsov (12):
wl12xx: don't queue a new dummy packet if one is already pending
wl12xx: don't indicate up PS-filtered dummy packets
wl12xx: AP mode - don't regulate FW blocks for non-active STAs
wl12xx: support up to 8 stations in AP-mode
wl12xx: don't regulate links when a single STA is connected
wl12xx: AP mode - enable the BA constraint event from the FW
wl12xx: AP mode - clean BA and queue state in tx_reset
wl12xx: set mac80211 flags for A-MPDU aggregation support
wl12xx: AP mode - support hidden SSID
wl12xx: correct fw_status structure for 8 sta support in AP-mode
wl12xx: report the stop_ba event to all STAs in AP-mode
mac80211: treat the WME sta flag as a bit
Dan Carpenter (4):
mwifiex: add a kfree() to an error path
mwifiex: remove unneeded NULL check
NFC: use after free on error
wl3501_cs: min_t() cast truncates high bits
Daniel Drake (1):
libertas: scan behaviour consistency improvements
David Herrmann (1):
Bluetooth: hidp: Add support for NO_INIT_REPORTS quirk
Don Fry (1):
iwlagn: replace beacon_time_fsf_bits variable with #define
Eliad Peller (20):
wl12xx: print acx id
wl12xx: print the seq_num of rx packet
wl12xx: add module_param to trigger BUG() on recovery
wl12xx: add beacon_filtering debugfs file
wl12xx: don't disconnect on recovery
wl12xx: don't use WL1271_SCAN_OPT_PRIORITY_HIGH flag
wl12xx: check for ROC on scan_complete
wl12xx: add config_hangover command
wl12xx: use kstrtoul_from_user
wl12xx: declare support for WIPHY_FLAG_AP_UAPSD
wl12xx: support p2p interfaces
cfg80211: add cfg80211_find_vendor_ie() function
wl12xx: remove TIM ie from probe response
wl12xx: remove P2P ie from probe response
wl12xx: send all pending packets on channel change
wl12xx: Use dev_hlid for auth and assoc req
wl12xx: implement set_bitrate_mask callback
mac80211: add ieee80211_vif param to tsf functions
cfg80211/mac80211: add netdev param to set_txq_params()
mac80211: save tx params per sdata
Emmanuel Grumbach (17):
iwlagn: warn about buggy fw that doesn't set SEQ_RX_FRAME
iwlagn: unmap cmd queue's tfds as BIDI
iwlagn: free the Tx cmd when a non empty Tx queue is freed
iwlagn: move iwl_stop / wake_queue to the upper layer
iwlagn: use enum iwl_rxon_context_id instead of u8
iwlagn: document the bus layer API
iwlagn: add documentation to the transport layer
iwlagn: provide data after WARN_ON
iwlagn: remove the callback in host commands
iwlagn: simplify the iwl_device_cmd layout
iwlagn: remove uneeded declaration
iwlagn: pending frames musn't be incremented if agg is on
iwlagn: remove warning in iwl_rx_handle
iwlagn: sparse warning priv->temperature is signed
iwlagn: set the sequence control from the transport layer
iwlagn: update rate scaling with BA notifications
iwlagn: use kcalloc when possible for array allocation
Felix Fietkau (7):
ath9k: fix setting the IEEE80211_TX_CTL_CLEAR_PS_FILT flag
ath9k: sync the dma buffer after changing the retry flag
ath9k_hw: clean up hardware revision checks
ath9k_hw: remove dead code in the eeprom ops
ath9k_hw: fix setting the hardware diversity flag
ath9k_hw: remove ar9100_hw_compute_pll_control
ath9k: fix a regression in ath9k_ps_restore
Fry, Donald H (2):
iwlagn: fix modinfo display for 135 ucode.
iwlagn: simplify chain_noise_num_beacons indirection
Ilan Elias (7):
NFC: Add dev_up and dev_down control operations
NFC: move nfc.h from include/net to include/net/nfc
NFC: basic NCI protocol implementation
NFC: driver for TI shared transport
NFC: improve readability of an 'if' in nci core.c
NFC: implicitly deactivate in nci_start_poll
NFC: protect nci_data_exchange transactions
Joe Perches (1):
iwlagn: Convert kzalloc to kcalloc
Johannes Berg (22):
iwlagn: move PCI-E transport files
iwlagn: generically provide iwl_trans_send_cmd_pdu
iwlagn: Makefile whitespace cleanup
iwlagn: clean up PM code
iwlagn: rename iwl-pci.h to iwl-cfg.h
iwlagn: remove unused function declarations
iwlagn: move sysfs files to debugfs
iwlagn: remove drvdata support from bus layer
iwlagn: do not use interruptible waits
cfg80211: validate IBSS BSSID
mac80211: fix AP/VLAN PS buffer race
iwlagn: move scan code to scan file
iwlagn: remove common station priv
iwlagn: split remain-on-channel
iwlagn: fix dangling scan request
iwlagn: fix dangling scan request
iwlagn: fix slot programming
iwlagn: remove Kelvin support
iwlagn: make iwl_scan_cancel_timeout void
iwlagn: refactor scan complete
iwlagn: move iwl_process_scan_complete up
iwlagn: fix scan complete processing
John W. Linville (7):
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
Revert "ath9k: do not insert padding into tx buffers on AR9380+"
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
Merge branch 'master' of git://github.com/padovan/bluetooth-next
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Jouni Malinen (4):
cfg80211/nl80211: Add PMKSA caching candidate event
cfg80211: Fix validation of AKM suites
cfg80211: Remove strict validation of AKM suites
cfg80211: Validate cipher suite against supported ciphers
Larry Finger (5):
rtlwifi: rtl8192ce: Change modinfo messages
rtlwifi: rtl8192se: Change modinfo messages
rtlwifi: rtl8192de: Change modinfo messages
rtlwifi: Combine instances of RTL_HAL_IS_CCK_RATE macros.
rtlwifi: rtl8192cu: Fix unitialized struct
Luciano Coelho (5):
wl12xx: remove deprecated CONFIG_WL12XX_HT flag
wl12xx: add support for sched_scan filters
wl12xx: increase number of allowed SSIDs in sched_scan
wl12xx: ignore sched scan match sets without SSID
wl12xx: fix forced passive scans
Luiz Augusto von Dentz (2):
Bluetooth: make use of connection number to optimize the scheduler
Bluetooth: mark l2cap_create_iframe_pdu as static
Mohammed Shafi Shajakhan (3):
rfkill: properly assign a boolean type
ath9k: Fix a dma warning/memory leak
ath9k: add Block ACK bitmap in sample debug
Peter Hurley (1):
Bluetooth: Add LE link type for debugfs output
Rafał Miłecki (10):
bcma: cc: export more control functions
b43: LCN-PHY: tweaks for channel switching
b43: LCN-PHY: set TX filters
b43: LCN-PHY: implement SPUR avoidance mode
b43: LCN-PHY: init TX power control
b43: LCN-PHY: add more init tweaks
b43: LCN-PHY: finish sense setup
b43: add missing MMIO defines
b43: update dummy transmission
b43: LCN-PHY: minor clean ups
Rajkumar Manoharan (9):
ath9k_hw: Fix magnitude/phase coeff correction
ath9k: load noise floor from history after the full chip reset
ath9k: Reset caldata on radio enable
mac80211: Fix regression on queue stop during 2040 bss change
wireless: Do not allow disabled channel in scan request
ath9k: Store noise immunity values across scanning
ath9k_hw: Fix Rx DMA stuck for AR9003 chips
nl80211/cfg80211: Add support to disable CCK rate for management frame
mac80211: Send the management frame at requested rate
Randy Dunlap (1):
nfc: NFC_WILINK depends on NFC_NCI
Shahar Levi (2):
wl12xx: fix sdio_test module functionality
wl12xx: Include OFDM rates in IBSS mode
Stanislaw Gruszka (2):
iwlegacy: fix command queue timeout
iwlegacy: do not use interruptible waits
Thomas Pedersen (1):
mac80211: notify peer when shutting down peer link
Vinicius Costa Gomes (15):
Bluetooth: Reset the security timer when a command is queued
Bluetooth: Add a flag to indicate that SMP is going on
Bluetooth: Use the same timeouts for both ACL and LE links
Bluetooth: Add support for pairing via mgmt over LE
Bluetooth: Add support for running SMP without a socket
Bluetooth: Add link_type information to the mgmt Connected event
Bluetooth: Move SMP fields to a separate structure
Bluetooth: Move SMP crypto functions to a workqueue
Bluetooth: Require authentication if MITM protection is requested
Bluetooth: Use the MEDIUM security level for pairings
Bluetooth: Fix sending wrong authentication requirements
Bluetooth: Use the LTK after receiving a LE Security Request
Revert "Bluetooth: Add support for communicating keys with userspace"
Bluetooth: Fix not setting a pending security level
Bluetooth: Remove support for other SMP keys than the LTK
Wey-Yi Guy (8):
iwlagn: New SKU for 6005 SFF
iwlagn: merge eeprom access into single file
iwlagn: add support for v2 of temperature offset calibration
iwlagn: use iwl_eeprom_calib_hdr structure
iwlagn: fix stack corruption for temperature offset v2
iwlagn: signedness bug
MAINTAINERS: update iwlwifi
iwlagn: add debugging to show probe related info in scan notification
MAINTAINERS | 4 +-
drivers/bcma/driver_chipcommon_pmu.c | 38 +-
drivers/net/wireless/adm8211.c | 3 +-
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 6 +-
drivers/net/wireless/ath/ath9k/ani.c | 10 +-
drivers/net/wireless/ath/ath9k/ani.h | 1 +
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 32 +-
drivers/net/wireless/ath/ath9k/ar9002_calib.c | 1 +
.../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +-
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 4 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 14 +-
drivers/net/wireless/ath/ath9k/debug.c | 24 +-
drivers/net/wireless/ath/ath9k/debug.h | 2 +
drivers/net/wireless/ath/ath9k/eeprom.c | 7 +-
drivers/net/wireless/ath/ath9k/eeprom_4k.c | 108 +-
drivers/net/wireless/ath/ath9k/eeprom_9287.c | 12 +-
drivers/net/wireless/ath/ath9k/eeprom_def.c | 46 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 9 +-
drivers/net/wireless/ath/ath9k/hw-ops.h | 5 -
drivers/net/wireless/ath/ath9k/hw.h | 1 -
drivers/net/wireless/ath/ath9k/init.c | 1 -
drivers/net/wireless/ath/ath9k/mac.c | 2 +-
drivers/net/wireless/ath/ath9k/mac.h | 4 -
drivers/net/wireless/ath/ath9k/main.c | 11 +-
drivers/net/wireless/ath/ath9k/recv.c | 10 +-
drivers/net/wireless/ath/ath9k/reg.h | 4 -
drivers/net/wireless/ath/ath9k/xmit.c | 60 +-
drivers/net/wireless/ath/carl9170/main.c | 3 +-
drivers/net/wireless/b43/b43.h | 40 +-
drivers/net/wireless/b43/main.c | 54 +-
drivers/net/wireless/b43/phy_lcn.c | 428 ++++-
drivers/net/wireless/b43/phy_lcn.h | 3 +
drivers/net/wireless/b43/tables_phy_lcn.c | 25 +-
drivers/net/wireless/iwlegacy/iwl-core.c | 7 +-
drivers/net/wireless/iwlegacy/iwl-core.h | 3 +-
drivers/net/wireless/iwlegacy/iwl-hcmd.c | 2 +-
drivers/net/wireless/iwlegacy/iwl-tx.c | 4 +-
drivers/net/wireless/iwlegacy/iwl3945-base.c | 8 +-
drivers/net/wireless/iwlegacy/iwl4965-base.c | 10 +-
drivers/net/wireless/iwlwifi/Makefile | 23 +-
drivers/net/wireless/iwlwifi/iwl-1000.c | 5 +-
drivers/net/wireless/iwlwifi/iwl-2000.c | 12 +-
drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-5000.c | 7 +-
drivers/net/wireless/iwlwifi/iwl-6000.c | 7 +-
drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 21 +-
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 299 ---
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 441 +-----
drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 16 +-
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 22 +-
drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 39 +-
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 63 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 162 +--
drivers/net/wireless/iwlwifi/iwl-agn.h | 19 +-
drivers/net/wireless/iwlwifi/iwl-bus.h | 72 +-
.../net/wireless/iwlwifi/{iwl-pci.h => iwl-cfg.h} | 5 +-
drivers/net/wireless/iwlwifi/iwl-commands.h | 8 +
drivers/net/wireless/iwlwifi/iwl-core.c | 59 +-
drivers/net/wireless/iwlwifi/iwl-core.h | 13 +-
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 87 +-
drivers/net/wireless/iwlwifi/iwl-dev.h | 19 +-
drivers/net/wireless/iwlwifi/iwl-eeprom.c | 244 +++-
drivers/net/wireless/iwlwifi/iwl-eeprom.h | 10 +-
drivers/net/wireless/iwlwifi/iwl-led.c | 1 -
drivers/net/wireless/iwlwifi/iwl-pci.c | 33 +-
drivers/net/wireless/iwlwifi/iwl-rx.c | 97 +-
drivers/net/wireless/iwlwifi/iwl-scan.c | 696 ++++++-
drivers/net/wireless/iwlwifi/iwl-shared.h | 146 +-
drivers/net/wireless/iwlwifi/iwl-sta.c | 37 +-
drivers/net/wireless/iwlwifi/iwl-sta.h | 5 +-
.../{iwl-trans-int-pcie.h => iwl-trans-pcie-int.h} | 26 +-
.../{iwl-trans-rx-pcie.c => iwl-trans-pcie-rx.c} | 36 +-
.../{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c} | 92 +-
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 1989 ++++++++++++++++++++
drivers/net/wireless/iwlwifi/iwl-trans.c | 1926 +-------------------
drivers/net/wireless/iwlwifi/iwl-trans.h | 44 +-
drivers/net/wireless/libertas/cfg.c | 33 +-
drivers/net/wireless/libertas/dev.h | 1 -
drivers/net/wireless/mwifiex/cfg80211.c | 7 +-
drivers/net/wireless/mwifiex/cmdevt.c | 3 +
drivers/net/wireless/mwifiex/main.h | 2 +-
drivers/net/wireless/mwifiex/scan.c | 29 +-
drivers/net/wireless/mwifiex/sta_ioctl.c | 16 +-
drivers/net/wireless/rt2x00/rt2400pci.c | 5 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 3 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
drivers/net/wireless/rt2x00/rt2800lib.h | 2 +-
drivers/net/wireless/rt2x00/rt61pci.c | 2 +-
drivers/net/wireless/rt2x00/rt73usb.c | 2 +-
drivers/net/wireless/rtl818x/rtl8180/dev.c | 5 +-
drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
drivers/net/wireless/rtlwifi/core.c | 8 +-
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 12 +-
drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 6 -
drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 6 -
drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 12 +-
drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 6 -
drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 +-
drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 14 +-
drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +-
drivers/net/wireless/rtlwifi/usb.c | 1 +
drivers/net/wireless/rtlwifi/wifi.h | 6 +
drivers/net/wireless/wl12xx/Kconfig | 10 -
drivers/net/wireless/wl12xx/Makefile | 6 +-
drivers/net/wireless/wl12xx/acx.c | 40 +
drivers/net/wireless/wl12xx/acx.h | 18 +
drivers/net/wireless/wl12xx/cmd.c | 60 +-
drivers/net/wireless/wl12xx/cmd.h | 7 +
drivers/net/wireless/wl12xx/conf.h | 29 +-
drivers/net/wireless/wl12xx/debugfs.c | 88 +-
drivers/net/wireless/wl12xx/event.c | 39 +-
drivers/net/wireless/wl12xx/init.c | 22 +-
drivers/net/wireless/wl12xx/main.c | 300 +++-
drivers/net/wireless/wl12xx/ps.c | 8 +-
drivers/net/wireless/wl12xx/rx.c | 9 +-
drivers/net/wireless/wl12xx/scan.c | 166 ++-
drivers/net/wireless/wl12xx/sdio_test.c | 15 +-
drivers/net/wireless/wl12xx/tx.c | 60 +-
drivers/net/wireless/wl12xx/tx.h | 9 +-
drivers/net/wireless/wl12xx/wl12xx.h | 13 +-
drivers/net/wireless/wl3501_cs.c | 2 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
drivers/nfc/Kconfig | 11 +
drivers/nfc/Makefile | 1 +
drivers/nfc/nfcwilink.c | 342 ++++
drivers/nfc/pn533.c | 4 +-
drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 12 +-
drivers/staging/winbond/wbusb.c | 2 +-
include/linux/bcma/bcma_driver_chipcommon.h | 9 +
include/linux/ieee80211.h | 10 +
include/linux/nfc.h | 6 +
include/linux/nl80211.h | 46 +
include/net/bluetooth/hci.h | 10 +
include/net/bluetooth/hci_core.h | 25 +-
include/net/bluetooth/l2cap.h | 8 +-
include/net/bluetooth/mgmt.h | 16 +
include/net/bluetooth/smp.h | 17 +
include/net/cfg80211.h | 36 +-
include/net/mac80211.h | 13 +-
include/net/nfc/nci.h | 313 +++
include/net/nfc/nci_core.h | 184 ++
include/net/{ => nfc}/nfc.h | 4 +
net/bluetooth/hci_conn.c | 2 +-
net/bluetooth/hci_core.c | 57 +-
net/bluetooth/hci_event.c | 16 +-
net/bluetooth/hci_sock.c | 18 +-
net/bluetooth/hci_sysfs.c | 2 +
net/bluetooth/hidp/core.c | 3 +
net/bluetooth/l2cap_core.c | 18 +-
net/bluetooth/mgmt.c | 212 ++-
net/bluetooth/smp.c | 421 +++--
net/mac80211/cfg.c | 12 +-
net/mac80211/debugfs.c | 52 -
net/mac80211/debugfs_netdev.c | 48 +-
net/mac80211/driver-ops.h | 27 +-
net/mac80211/driver-trace.h | 40 +-
net/mac80211/ibss.c | 6 +-
net/mac80211/ieee80211_i.h | 5 +-
net/mac80211/iface.c | 10 +-
net/mac80211/mesh_plink.c | 8 +
net/mac80211/mlme.c | 49 +-
net/mac80211/rate.c | 29 +-
net/mac80211/scan.c | 3 +-
net/mac80211/util.c | 23 +-
net/mac80211/work.c | 2 +-
net/nfc/Kconfig | 2 +
net/nfc/Makefile | 1 +
net/nfc/core.c | 77 +
net/nfc/nci/Kconfig | 10 +
net/nfc/nci/Makefile | 7 +
net/nfc/nci/core.c | 797 ++++++++
net/nfc/nci/data.c | 247 +++
net/nfc/nci/lib.c | 94 +
net/nfc/nci/ntf.c | 258 +++
net/nfc/nci/rsp.c | 226 +++
net/nfc/netlink.c | 56 +
net/nfc/nfc.h | 6 +-
net/rfkill/core.c | 2 +-
net/wireless/core.h | 4 +-
net/wireless/mlme.c | 16 +-
net/wireless/nl80211.c | 100 +-
net/wireless/nl80211.h | 4 +
net/wireless/scan.c | 27 +
net/wireless/sme.c | 19 +-
net/wireless/util.c | 16 +-
186 files changed, 8573 insertions(+), 4415 deletions(-)
delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
rename drivers/net/wireless/iwlwifi/{iwl-pci.h => iwl-cfg.h} (97%)
rename drivers/net/wireless/iwlwifi/{iwl-trans-int-pcie.h => iwl-trans-pcie-int.h} (94%)
rename drivers/net/wireless/iwlwifi/{iwl-trans-rx-pcie.c => iwl-trans-pcie-rx.c} (97%)
rename drivers/net/wireless/iwlwifi/{iwl-trans-tx-pcie.c => iwl-trans-pcie-tx.c} (94%)
create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
create mode 100644 drivers/nfc/nfcwilink.c
create mode 100644 include/net/nfc/nci.h
create mode 100644 include/net/nfc/nci_core.h
rename include/net/{ => nfc}/nfc.h (97%)
create mode 100644 net/nfc/nci/Kconfig
create mode 100644 net/nfc/nci/Makefile
create mode 100644 net/nfc/nci/core.c
create mode 100644 net/nfc/nci/data.c
create mode 100644 net/nfc/nci/lib.c
create mode 100644 net/nfc/nci/ntf.c
create mode 100644 net/nfc/nci/rsp.c
Omnibus patch is (or should be) available here:
http://bombadil.infradead.org/users/linville/wireless-next-2011-09-30.patch.gz
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* Re: pull request: wireless-next 2011-09-30
From: David Miller @ 2011-09-30 19:27 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, netdev
In-Reply-To: <20110930191131.GC2526@tuxdriver.com>
From: "John W. Linville" <linville@tuxdriver.com>
Date: Fri, 30 Sep 2011 15:11:31 -0400
> Here is yet another big package of wireless updates for 3.2. Highlights
> include a bluetooth pull, a wl12xx pull, and a pull of the wireless tree
> to fix some merge issues. Also included is the usual big sets of
> updates to ath9k, iwlagn, b43, and others. Plus, the NFC subsystem grew
> NCI support.
>
> Please let me know if there are problems!
Pulled, thanks John.
^ permalink raw reply
* Re: [PATCH] net: sh_eth: fix build failure
From: Nobuhiro Iwamatsu @ 2011-09-30 19:36 UTC (permalink / raw)
To: David Miller; +Cc: yoshihiro.shimoda.uh, sfr, netdev, linux-sh
In-Reply-To: <20110930.035449.1012299223616580574.davem@davemloft.net>
I see.
Thanks you.
Nobuhiro
2011/9/30 David Miller <davem@davemloft.net>:
> From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> Date: Fri, 30 Sep 2011 16:51:34 +0900
>
>> 2011/09/30 15:55, Nobuhiro Iwamatsu wrote:
>>> 2011/9/30 Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>:
>> < snip >
>>>> +#include <linux/kernel.h>
>>>> +#include <linux/spinlock.h>
>>> These are not required.
>>
>> The Documentation/SubmitChecklist says the following:
>>
>> ========================================================
>> 1: If you use a facility then #include the file that defines/declares
>> that facility. Don't depend on other header files pulling in ones
>> that you use.
>> ========================================================
>>
>> The sh_eth driver uses spinlock functions and some macros of kernel.h.
>> So, I think that I have to write their "#include" in the driver.
>
> Agreed.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Nobuhiro Iwamatsu
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox