linux integration; annotated tag, v2.6.37-rc8, created. v2.6.37-rc8
by postmaster＠open-mesh.org 29 Dec '10
by postmaster＠open-mesh.org 29 Dec '10
29 Dec '10
The annotated tag, v2.6.37-rc8 has been created
at 5720e551140dd586156e9875b0d1ef528e9c5f59 (tag)
tagging 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (commit)
replaces v2.6.37-rc7
tagged by Linus Torvalds
on Tue Dec 28 17:05:58 2010 -0800
- Shortlog ------------------------------------------------------------
Linux 2.6.37-rc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk0aiXsACgkQF3YsRnbiHLvuYgCfXpp+BB1YgrAm6KdDzlLTYeto
VRwAnRPbvyDN9N/q9VbO47UtuuO+/twG
=ig+9
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
1
0
29 Dec '10
The following commit has been merged in the master branch:
commit db75644cdd24e29ee3a7cc0ff105224b291a22b3
Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
Date: Wed Dec 29 16:15:19 2010 +0000
batman-adv: remove unused parameters
Some function parameters are obsolete now and can be removed.
Reported-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
diff --git a/originator.c b/originator.c
index 6816054..c043bf8 100644
--- a/originator.c
+++ b/originator.c
@@ -276,7 +276,7 @@ static bool purge_orig_node(struct bat_priv *bat_priv,
orig_node->hna_buff_len);
/* update bonding candidates, we could have lost
* some candidates. */
- update_bonding_candidates(bat_priv, orig_node);
+ update_bonding_candidates(orig_node);
}
}
diff --git a/routing.c b/routing.c
index abce1ae..90ca129 100644
--- a/routing.c
+++ b/routing.c
@@ -452,8 +452,7 @@ static char count_real_packets(struct ethhdr *ethhdr,
}
/* copy primary address for bonding */
-static void mark_bonding_address(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
+static void mark_bonding_address(struct orig_node *orig_node,
struct orig_node *orig_neigh_node,
struct batman_packet *batman_packet)
@@ -466,8 +465,7 @@ static void mark_bonding_address(struct bat_priv *bat_priv,
}
/* mark possible bond.candidates in the neighbor list */
-void update_bonding_candidates(struct bat_priv *bat_priv,
- struct orig_node *orig_node)
+void update_bonding_candidates(struct orig_node *orig_node)
{
int candidates;
int interference_candidate;
@@ -757,9 +755,8 @@ void receive_bat_packet(struct ethhdr *ethhdr,
update_orig(bat_priv, orig_node, ethhdr, batman_packet,
if_incoming, hna_buff, hna_buff_len, is_duplicate);
- mark_bonding_address(bat_priv, orig_node,
- orig_neigh_node, batman_packet);
- update_bonding_candidates(bat_priv, orig_node);
+ mark_bonding_address(orig_node, orig_neigh_node, batman_packet);
+ update_bonding_candidates(orig_node);
/* is single hop (direct) neighbor */
if (is_single_hop_neigh) {
@@ -893,7 +890,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv,
}
static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
- struct sk_buff *skb, size_t icmp_len)
+ struct sk_buff *skb)
{
struct orig_node *orig_node;
struct icmp_packet *icmp_packet;
@@ -1005,7 +1002,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if)
/* TTL exceeded */
if (icmp_packet->ttl < 2)
- return recv_icmp_ttl_exceeded(bat_priv, skb, hdr_size);
+ return recv_icmp_ttl_exceeded(bat_priv, skb);
ret = NET_RX_DROP;
diff --git a/routing.h b/routing.h
index f108f23..725cc38 100644
--- a/routing.h
+++ b/routing.h
@@ -42,7 +42,6 @@ int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if);
int recv_bat_packet(struct sk_buff *skb, struct batman_if *recv_if);
struct neigh_node *find_router(struct bat_priv *bat_priv,
struct orig_node *orig_node, struct batman_if *recv_if);
-void update_bonding_candidates(struct bat_priv *bat_priv,
- struct orig_node *orig_node);
+void update_bonding_candidates(struct orig_node *orig_node);
#endif /* _NET_BATMAN_ADV_ROUTING_H_ */
diff --git a/send.c b/send.c
index b89b9f7..77f8297 100644
--- a/send.c
+++ b/send.c
@@ -49,7 +49,7 @@ static unsigned long own_send_time(struct bat_priv *bat_priv)
}
/* when do we schedule a forwarded packet to be sent */
-static unsigned long forward_send_time(struct bat_priv *bat_priv)
+static unsigned long forward_send_time(void)
{
return jiffies + msecs_to_jiffies(random32() % (JITTER/2));
}
@@ -356,7 +356,7 @@ void schedule_forward_packet(struct orig_node *orig_node,
else
batman_packet->flags &= ~DIRECTLINK;
- send_time = forward_send_time(bat_priv);
+ send_time = forward_send_time();
add_bat_packet_to_list(bat_priv,
(unsigned char *)batman_packet,
sizeof(struct batman_packet) + hna_buff_len,
--
batman-adv
1
0
linux integration; annotated tag, v2.6.37-rc7, created. v2.6.37-rc7
by postmaster＠open-mesh.org 21 Dec '10
by postmaster＠open-mesh.org 21 Dec '10
21 Dec '10
The annotated tag, v2.6.37-rc7 has been created
at 6261d1ea5bdbc9baf84c192242c82e63cdb02788 (tag)
tagging 90a8a73c06cc32b609a880d48449d7083327e11a (commit)
replaces v2.6.37-rc6
tagged by Linus Torvalds
on Tue Dec 21 11:26:52 2010 -0800
- Shortlog ------------------------------------------------------------
Linux 2.6.37-rc7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk0Q/4EACgkQF3YsRnbiHLv4JwCfaCNAacPyu3yzGTAGAJOh4lAd
V6sAnR4wSFsYMIhRgBI3TGolzSHJSBJF
=ttYB
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
1
0
21 Dec '10
The following commit has been merged in the master branch:
commit 06738bfffeba54435d88a002cb75004101d07492
Author: Antonio Quartulli <ordex(a)ritirata.org>
Date: Tue Dec 21 02:16:28 2010 +0000
batman-adv: Modifing hna_local_fill_buffer() return value
After changeset 1888, the return value of hna_local_fill_buffer() has
not been changed to _count_. In this way an eroneous num_hna was
calculated before sending the new OGM packet.
Signed-off-by: Antonio Quartulli <ordex(a)ritirata.org>
diff --git a/translation-table.c b/translation-table.c
index a19e16c..a633b5a 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -162,7 +162,7 @@ int hna_local_fill_buffer(struct bat_priv *bat_priv,
atomic_set(&bat_priv->hna_local_changed, 0);
spin_unlock_bh(&bat_priv->hna_lhash_lock);
- return i;
+ return count;
}
int hna_local_seq_print_text(struct seq_file *seq, void *offset)
--
batman-adv
1
0
linux integration; branch, linux, updated. v2.6.37-rc2-819-gc47bc5f
by postmaster＠open-mesh.org 20 Dec '10
by postmaster＠open-mesh.org 20 Dec '10
20 Dec '10
The following commit has been merged in the linux branch:
commit 3d46bb92d9610f8f15e9f63e7f0fb82d2fa86c82
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Thu Dec 16 23:28:17 2010 +0100
Staging: batman-adv: Remove batman-adv from staging
batman-adv is now moved to net/batman-adv/ and can be removed from
staging.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Cc: David S. Miller <davem(a)davemloft.net>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 5eafdf4..5cefe7d 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -127,8 +127,6 @@ source "drivers/staging/wlags49_h2/Kconfig"
source "drivers/staging/wlags49_h25/Kconfig"
-source "drivers/staging/batman-adv/Kconfig"
-
source "drivers/staging/samsung-laptop/Kconfig"
source "drivers/staging/sm7xx/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index a97a955..6a66b26 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -46,7 +46,6 @@ obj-$(CONFIG_IIO) += iio/
obj-$(CONFIG_ZRAM) += zram/
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
-obj-$(CONFIG_BATMAN_ADV) += batman-adv/
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop/
obj-$(CONFIG_FB_SM7XX) += sm7xx/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
diff --git a/drivers/staging/batman-adv/Kconfig b/drivers/staging/batman-adv/Kconfig
deleted file mode 100644
index 8553f35..0000000
--- a/drivers/staging/batman-adv/Kconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# B.A.T.M.A.N meshing protocol
-#
-
-config BATMAN_ADV
- tristate "B.A.T.M.A.N. Advanced Meshing Protocol"
- depends on NET
- default n
- ---help---
-
- B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
- a routing protocol for multi-hop ad-hoc mesh networks. The
- networks may be wired or wireless. See
- http://www.open-mesh.org/ for more information and user space
- tools.
-
-config BATMAN_ADV_DEBUG
- bool "B.A.T.M.A.N. debugging"
- depends on BATMAN_ADV != n
- ---help---
-
- This is an option for use by developers; most people should
- say N here. This enables compilation of support for
- outputting debugging information to the kernel log. The
- output is controlled via the module parameter debug.
-
diff --git a/drivers/staging/batman-adv/Makefile b/drivers/staging/batman-adv/Makefile
deleted file mode 100644
index d936aec..0000000
--- a/drivers/staging/batman-adv/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
-#
-# Marek Lindner, Simon Wunderlich
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of version 2 of the GNU General Public
-# License as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA
-#
-
-obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
-batman-adv-y += aggregation.o
-batman-adv-y += bat_debugfs.o
-batman-adv-y += bat_sysfs.o
-batman-adv-y += bitarray.o
-batman-adv-y += gateway_client.o
-batman-adv-y += gateway_common.o
-batman-adv-y += hard-interface.o
-batman-adv-y += hash.o
-batman-adv-y += icmp_socket.o
-batman-adv-y += main.o
-batman-adv-y += originator.o
-batman-adv-y += ring_buffer.o
-batman-adv-y += routing.o
-batman-adv-y += send.o
-batman-adv-y += soft-interface.o
-batman-adv-y += translation-table.o
-batman-adv-y += unicast.o
-batman-adv-y += vis.o
diff --git a/drivers/staging/batman-adv/README b/drivers/staging/batman-adv/README
deleted file mode 100644
index 77f0cdd..0000000
--- a/drivers/staging/batman-adv/README
+++ /dev/null
@@ -1,240 +0,0 @@
-[state: 21-11-2010]
-
-BATMAN-ADV
-----------
-
-Batman advanced is a new approach to wireless networking which
-does no longer operate on the IP basis. Unlike the batman daemon,
-which exchanges information using UDP packets and sets routing
-tables, batman-advanced operates on ISO/OSI Layer 2 only and uses
-and routes (or better: bridges) Ethernet Frames. It emulates a
-virtual network switch of all nodes participating. Therefore all
-nodes appear to be link local, thus all higher operating proto-
-cols won't be affected by any changes within the network. You can
-run almost any protocol above batman advanced, prominent examples
-are: IPv4, IPv6, DHCP, IPX.
-
-Batman advanced was implemented as a Linux kernel driver to re-
-duce the overhead to a minimum. It does not depend on any (other)
-network driver, and can be used on wifi as well as ethernet lan,
-vpn, etc ... (anything with ethernet-style layer 2).
-
-CONFIGURATION
--------------
-
-Load the batman-adv module into your kernel:
-
-# insmod batman-adv.ko
-
-The module is now waiting for activation. You must add some in-
-terfaces on which batman can operate. After loading the module
-batman advanced will scan your systems interfaces to search for
-compatible interfaces. Once found, it will create subfolders in
-the /sys directories of each supported interface, e.g.
-
-# ls /sys/class/net/eth0/batman_adv/
-# iface_status mesh_iface
-
-If an interface does not have the "batman_adv" subfolder it prob-
-ably is not supported. Not supported interfaces are: loopback,
-non-ethernet and batman's own interfaces.
-
-Note: After the module was loaded it will continuously watch for
-new interfaces to verify the compatibility. There is no need to
-reload the module if you plug your USB wifi adapter into your ma-
-chine after batman advanced was initially loaded.
-
-To activate a given interface simply write "bat0" into its
-"mesh_iface" file inside the batman_adv subfolder:
-
-# echo bat0 > /sys/class/net/eth0/batman_adv/mesh_iface
-
-Repeat this step for all interfaces you wish to add. Now batman
-starts using/broadcasting on this/these interface(s).
-
-By reading the "iface_status" file you can check its status:
-
-# cat /sys/class/net/eth0/batman_adv/iface_status
-# active
-
-To deactivate an interface you have to write "none" into its
-"mesh_iface" file:
-
-# echo none > /sys/class/net/eth0/batman_adv/mesh_iface
-
-
-All mesh wide settings can be found in batman's own interface
-folder:
-
-# ls /sys/class/net/bat0/mesh/
-# aggregated_ogms bonding fragmentation orig_interval
-# vis_mode
-
-
-There is a special folder for debugging informations:
-
-# ls /sys/kernel/debug/batman_adv/bat0/
-# originators socket transtable_global transtable_local
-# vis_data
-
-
-Some of the files contain all sort of status information regard-
-ing the mesh network. For example, you can view the table of
-originators (mesh participants) with:
-
-# cat /sys/kernel/debug/batman_adv/bat0/originators
-
-Other files allow to change batman's behaviour to better fit your
-requirements. For instance, you can check the current originator
-interval (value in milliseconds which determines how often batman
-sends its broadcast packets):
-
-# cat /sys/class/net/bat0/mesh/orig_interval
-# 1000
-
-and also change its value:
-
-# echo 3000 > /sys/class/net/bat0/mesh/orig_interval
-
-In very mobile scenarios, you might want to adjust the originator
-interval to a lower value. This will make the mesh more respon-
-sive to topology changes, but will also increase the overhead.
-
-
-USAGE
------
-
-To make use of your newly created mesh, batman advanced provides
-a new interface "bat0" which you should use from this point on.
-All interfaces added to batman advanced are not relevant any
-longer because batman handles them for you. Basically, one "hands
-over" the data by using the batman interface and batman will make
-sure it reaches its destination.
-
-The "bat0" interface can be used like any other regular inter-
-face. It needs an IP address which can be either statically con-
-figured or dynamically (by using DHCP or similar services):
-
-# NodeA: ifconfig bat0 192.168.0.1
-# NodeB: ifconfig bat0 192.168.0.2
-# NodeB: ping 192.168.0.1
-
-Note: In order to avoid problems remove all IP addresses previ-
-ously assigned to interfaces now used by batman advanced, e.g.
-
-# ifconfig eth0 0.0.0.0
-
-
-VISUALIZATION
--------------
-
-If you want topology visualization, at least one mesh node must
-be configured as VIS-server:
-
-# echo "server" > /sys/class/net/bat0/mesh/vis_mode
-
-Each node is either configured as "server" or as "client" (de-
-fault: "client"). Clients send their topology data to the server
-next to them, and server synchronize with other servers. If there
-is no server configured (default) within the mesh, no topology
-information will be transmitted. With these "synchronizing
-servers", there can be 1 or more vis servers sharing the same (or
-at least very similar) data.
-
-When configured as server, you can get a topology snapshot of
-your mesh:
-
-# cat /sys/kernel/debug/batman_adv/bat0/vis_data
-
-This raw output is intended to be easily parsable and convertable
-with other tools. Have a look at the batctl README if you want a
-vis output in dot or json format for instance and how those out-
-puts could then be visualised in an image.
-
-The raw format consists of comma separated values per entry where
-each entry is giving information about a certain source inter-
-face. Each entry can/has to have the following values:
--> "mac" - mac address of an originator's source interface
- (each line begins with it)
--> "TQ mac value" - src mac's link quality towards mac address
- of a neighbor originator's interface which
- is being used for routing
--> "HNA mac" - HNA announced by source mac
--> "PRIMARY" - this is a primary interface
--> "SEC mac" - secondary mac address of source
- (requires preceding PRIMARY)
-
-The TQ value has a range from 4 to 255 with 255 being the best.
-The HNA entries are showing which hosts are connected to the mesh
-via bat0 or being bridged into the mesh network. The PRIMARY/SEC
-values are only applied on primary interfaces
-
-
-LOGGING/DEBUGGING
------------------
-
-All error messages, warnings and information messages are sent to
-the kernel log. Depending on your operating system distribution
-this can be read in one of a number of ways. Try using the com-
-mands: dmesg, logread, or looking in the files /var/log/kern.log
-or /var/log/syslog. All batman-adv messages are prefixed with
-"batman-adv:" So to see just these messages try
-
-# dmesg | grep batman-adv
-
-When investigating problems with your mesh network it is some-
-times necessary to see more detail debug messages. This must be
-enabled when compiling the batman-adv module. When building bat-
-man-adv as part of kernel, use "make menuconfig" and enable the
-option "B.A.T.M.A.N. debugging".
-
-Those additional debug messages can be accessed using a special
-file in debugfs
-
-# cat /sys/kernel/debug/batman_adv/bat0/log
-
-The additional debug output is by default disabled. It can be en-
-abled during run time. Following log_levels are defined:
-
-0 - All debug output disabled
-1 - Enable messages related to routing / flooding / broadcasting
-2 - Enable route or hna added / changed / deleted
-3 - Enable all messages
-
-The debug output can be changed at runtime using the file
-/sys/class/net/bat0/mesh/log_level. e.g.
-
-# echo 2 > /sys/class/net/bat0/mesh/log_level
-
-will enable debug messages for when routes or HNAs change.
-
-
-BATCTL
-------
-
-As batman advanced operates on layer 2 all hosts participating in
-the virtual switch are completely transparent for all protocols
-above layer 2. Therefore the common diagnosis tools do not work
-as expected. To overcome these problems batctl was created. At
-the moment the batctl contains ping, traceroute, tcpdump and
-interfaces to the kernel module settings.
-
-For more information, please see the manpage (man batctl).
-
-batctl is available on http://www.open-mesh.org/
-
-
-CONTACT
--------
-
-Please send us comments, experiences, questions, anything :)
-
-IRC: #batman on irc.freenode.org
-Mailing-list: b.a.t.m.a.n@b.a.t.m.a.n@lists.open-mesh.org
- (optional subscription at
- https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n)
-
-You can also contact the Authors:
-
-Marek Lindner <lindner_marek(a)yahoo.de>
-Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
diff --git a/drivers/staging/batman-adv/TODO b/drivers/staging/batman-adv/TODO
deleted file mode 100644
index ba69ba3..0000000
--- a/drivers/staging/batman-adv/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
- * Request a new review
- * Process the comments from the review
- * Move into mainline proper
-
-Please send all patches to:
- Marek Lindner <lindner_marek(a)yahoo.de>
- Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
- Sven Eckelmann <sven.eckelmann(a)gmx.de>
- b.a.t.m.a.n(a)lists.open-mesh.org
- Greg Kroah-Hartman <gregkh(a)suse.de>
diff --git a/drivers/staging/batman-adv/aggregation.c b/drivers/staging/batman-adv/aggregation.c
deleted file mode 100644
index 0c92e3b..0000000
--- a/drivers/staging/batman-adv/aggregation.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "aggregation.h"
-#include "send.h"
-#include "routing.h"
-
-/* calculate the size of the hna information for a given packet */
-static int hna_len(struct batman_packet *batman_packet)
-{
- return batman_packet->num_hna * ETH_ALEN;
-}
-
-/* return true if new_packet can be aggregated with forw_packet */
-static bool can_aggregate_with(struct batman_packet *new_batman_packet,
- int packet_len,
- unsigned long send_time,
- bool directlink,
- struct batman_if *if_incoming,
- struct forw_packet *forw_packet)
-{
- struct batman_packet *batman_packet =
- (struct batman_packet *)forw_packet->skb->data;
- int aggregated_bytes = forw_packet->packet_len + packet_len;
-
- /**
- * we can aggregate the current packet to this aggregated packet
- * if:
- *
- * - the send time is within our MAX_AGGREGATION_MS time
- * - the resulting packet wont be bigger than
- * MAX_AGGREGATION_BYTES
- */
-
- if (time_before(send_time, forw_packet->send_time) &&
- time_after_eq(send_time + msecs_to_jiffies(MAX_AGGREGATION_MS),
- forw_packet->send_time) &&
- (aggregated_bytes <= MAX_AGGREGATION_BYTES)) {
-
- /**
- * check aggregation compatibility
- * -> direct link packets are broadcasted on
- * their interface only
- * -> aggregate packet if the current packet is
- * a "global" packet as well as the base
- * packet
- */
-
- /* packets without direct link flag and high TTL
- * are flooded through the net */
- if ((!directlink) &&
- (!(batman_packet->flags & DIRECTLINK)) &&
- (batman_packet->ttl != 1) &&
-
- /* own packets originating non-primary
- * interfaces leave only that interface */
- ((!forw_packet->own) ||
- (forw_packet->if_incoming->if_num == 0)))
- return true;
-
- /* if the incoming packet is sent via this one
- * interface only - we still can aggregate */
- if ((directlink) &&
- (new_batman_packet->ttl == 1) &&
- (forw_packet->if_incoming == if_incoming) &&
-
- /* packets from direct neighbors or
- * own secondary interface packets
- * (= secondary interface packets in general) */
- (batman_packet->flags & DIRECTLINK ||
- (forw_packet->own &&
- forw_packet->if_incoming->if_num != 0)))
- return true;
- }
-
- return false;
-}
-
-#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0)
-/* create a new aggregated packet and add this packet to it */
-static void new_aggregated_packet(unsigned char *packet_buff, int packet_len,
- unsigned long send_time, bool direct_link,
- struct batman_if *if_incoming,
- int own_packet)
-{
- struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- struct forw_packet *forw_packet_aggr;
- unsigned char *skb_buff;
-
- /* own packet should always be scheduled */
- if (!own_packet) {
- if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "batman packet queue full\n");
- return;
- }
- }
-
- forw_packet_aggr = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC);
- if (!forw_packet_aggr) {
- if (!own_packet)
- atomic_inc(&bat_priv->batman_queue_left);
- return;
- }
-
- if ((atomic_read(&bat_priv->aggregated_ogms)) &&
- (packet_len < MAX_AGGREGATION_BYTES))
- forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES +
- sizeof(struct ethhdr));
- else
- forw_packet_aggr->skb = dev_alloc_skb(packet_len +
- sizeof(struct ethhdr));
-
- if (!forw_packet_aggr->skb) {
- if (!own_packet)
- atomic_inc(&bat_priv->batman_queue_left);
- kfree(forw_packet_aggr);
- return;
- }
- skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr));
-
- INIT_HLIST_NODE(&forw_packet_aggr->list);
-
- skb_buff = skb_put(forw_packet_aggr->skb, packet_len);
- forw_packet_aggr->packet_len = packet_len;
- memcpy(skb_buff, packet_buff, packet_len);
-
- forw_packet_aggr->own = own_packet;
- forw_packet_aggr->if_incoming = if_incoming;
- forw_packet_aggr->num_packets = 0;
- forw_packet_aggr->direct_link_flags = 0;
- forw_packet_aggr->send_time = send_time;
-
- /* save packet direct link flag status */
- if (direct_link)
- forw_packet_aggr->direct_link_flags |= 1;
-
- /* add new packet to packet list */
- spin_lock_bh(&bat_priv->forw_bat_list_lock);
- hlist_add_head(&forw_packet_aggr->list, &bat_priv->forw_bat_list);
- spin_unlock_bh(&bat_priv->forw_bat_list_lock);
-
- /* start timer for this packet */
- INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work,
- send_outstanding_bat_packet);
- queue_delayed_work(bat_event_workqueue,
- &forw_packet_aggr->delayed_work,
- send_time - jiffies);
-}
-
-/* aggregate a new packet into the existing aggregation */
-static void aggregate(struct forw_packet *forw_packet_aggr,
- unsigned char *packet_buff,
- int packet_len,
- bool direct_link)
-{
- unsigned char *skb_buff;
-
- skb_buff = skb_put(forw_packet_aggr->skb, packet_len);
- memcpy(skb_buff, packet_buff, packet_len);
- forw_packet_aggr->packet_len += packet_len;
- forw_packet_aggr->num_packets++;
-
- /* save packet direct link flag status */
- if (direct_link)
- forw_packet_aggr->direct_link_flags |=
- (1 << forw_packet_aggr->num_packets);
-}
-
-void add_bat_packet_to_list(struct bat_priv *bat_priv,
- unsigned char *packet_buff, int packet_len,
- struct batman_if *if_incoming, char own_packet,
- unsigned long send_time)
-{
- /**
- * _aggr -> pointer to the packet we want to aggregate with
- * _pos -> pointer to the position in the queue
- */
- struct forw_packet *forw_packet_aggr = NULL, *forw_packet_pos = NULL;
- struct hlist_node *tmp_node;
- struct batman_packet *batman_packet =
- (struct batman_packet *)packet_buff;
- bool direct_link = batman_packet->flags & DIRECTLINK ? 1 : 0;
-
- /* find position for the packet in the forward queue */
- spin_lock_bh(&bat_priv->forw_bat_list_lock);
- /* own packets are not to be aggregated */
- if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {
- hlist_for_each_entry(forw_packet_pos, tmp_node,
- &bat_priv->forw_bat_list, list) {
- if (can_aggregate_with(batman_packet,
- packet_len,
- send_time,
- direct_link,
- if_incoming,
- forw_packet_pos)) {
- forw_packet_aggr = forw_packet_pos;
- break;
- }
- }
- }
-
- /* nothing to aggregate with - either aggregation disabled or no
- * suitable aggregation packet found */
- if (forw_packet_aggr == NULL) {
- /* the following section can run without the lock */
- spin_unlock_bh(&bat_priv->forw_bat_list_lock);
-
- /**
- * if we could not aggregate this packet with one of the others
- * we hold it back for a while, so that it might be aggregated
- * later on
- */
- if ((!own_packet) &&
- (atomic_read(&bat_priv->aggregated_ogms)))
- send_time += msecs_to_jiffies(MAX_AGGREGATION_MS);
-
- new_aggregated_packet(packet_buff, packet_len,
- send_time, direct_link,
- if_incoming, own_packet);
- } else {
- aggregate(forw_packet_aggr,
- packet_buff, packet_len,
- direct_link);
- spin_unlock_bh(&bat_priv->forw_bat_list_lock);
- }
-}
-
-/* unpack the aggregated packets and process them one by one */
-void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff,
- int packet_len, struct batman_if *if_incoming)
-{
- struct batman_packet *batman_packet;
- int buff_pos = 0;
- unsigned char *hna_buff;
-
- batman_packet = (struct batman_packet *)packet_buff;
-
- do {
- /* network to host order for our 32bit seqno, and the
- orig_interval. */
- batman_packet->seqno = ntohl(batman_packet->seqno);
-
- hna_buff = packet_buff + buff_pos + BAT_PACKET_LEN;
- receive_bat_packet(ethhdr, batman_packet,
- hna_buff, hna_len(batman_packet),
- if_incoming);
-
- buff_pos += BAT_PACKET_LEN + hna_len(batman_packet);
- batman_packet = (struct batman_packet *)
- (packet_buff + buff_pos);
- } while (aggregated_packet(buff_pos, packet_len,
- batman_packet->num_hna));
-}
diff --git a/drivers/staging/batman-adv/aggregation.h b/drivers/staging/batman-adv/aggregation.h
deleted file mode 100644
index 71a91b3..0000000
--- a/drivers/staging/batman-adv/aggregation.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_AGGREGATION_H_
-#define _NET_BATMAN_ADV_AGGREGATION_H_
-
-#include "main.h"
-
-/* is there another aggregated packet here? */
-static inline int aggregated_packet(int buff_pos, int packet_len, int num_hna)
-{
- int next_buff_pos = buff_pos + BAT_PACKET_LEN + (num_hna * ETH_ALEN);
-
- return (next_buff_pos <= packet_len) &&
- (next_buff_pos <= MAX_AGGREGATION_BYTES);
-}
-
-void add_bat_packet_to_list(struct bat_priv *bat_priv,
- unsigned char *packet_buff, int packet_len,
- struct batman_if *if_incoming, char own_packet,
- unsigned long send_time);
-void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff,
- int packet_len, struct batman_if *if_incoming);
-
-#endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */
diff --git a/drivers/staging/batman-adv/bat_debugfs.c b/drivers/staging/batman-adv/bat_debugfs.c
deleted file mode 100644
index 0ae81d0..0000000
--- a/drivers/staging/batman-adv/bat_debugfs.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-
-#include <linux/debugfs.h>
-
-#include "bat_debugfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "soft-interface.h"
-#include "vis.h"
-#include "icmp_socket.h"
-
-static struct dentry *bat_debugfs;
-
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-#define LOG_BUFF_MASK (log_buff_len-1)
-#define LOG_BUFF(idx) (debug_log->log_buff[(idx) & LOG_BUFF_MASK])
-
-static int log_buff_len = LOG_BUF_LEN;
-
-static void emit_log_char(struct debug_log *debug_log, char c)
-{
- LOG_BUFF(debug_log->log_end) = c;
- debug_log->log_end++;
-
- if (debug_log->log_end - debug_log->log_start > log_buff_len)
- debug_log->log_start = debug_log->log_end - log_buff_len;
-}
-
-static int fdebug_log(struct debug_log *debug_log, char *fmt, ...)
-{
- int printed_len;
- va_list args;
- static char debug_log_buf[256];
- char *p;
-
- if (!debug_log)
- return 0;
-
- spin_lock_bh(&debug_log->lock);
- va_start(args, fmt);
- printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf),
- fmt, args);
- va_end(args);
-
- for (p = debug_log_buf; *p != 0; p++)
- emit_log_char(debug_log, *p);
-
- spin_unlock_bh(&debug_log->lock);
-
- wake_up(&debug_log->queue_wait);
-
- return 0;
-}
-
-int debug_log(struct bat_priv *bat_priv, char *fmt, ...)
-{
- va_list args;
- char tmp_log_buf[256];
-
- va_start(args, fmt);
- vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
- fdebug_log(bat_priv->debug_log, "[%10u] %s",
- (jiffies / HZ), tmp_log_buf);
- va_end(args);
-
- return 0;
-}
-
-static int log_open(struct inode *inode, struct file *file)
-{
- nonseekable_open(inode, file);
- file->private_data = inode->i_private;
- inc_module_count();
- return 0;
-}
-
-static int log_release(struct inode *inode, struct file *file)
-{
- dec_module_count();
- return 0;
-}
-
-static ssize_t log_read(struct file *file, char __user *buf,
- size_t count, loff_t *ppos)
-{
- struct bat_priv *bat_priv = file->private_data;
- struct debug_log *debug_log = bat_priv->debug_log;
- int error, i = 0;
- char c;
-
- if ((file->f_flags & O_NONBLOCK) &&
- !(debug_log->log_end - debug_log->log_start))
- return -EAGAIN;
-
- if ((!buf) || (count < 0))
- return -EINVAL;
-
- if (count == 0)
- return 0;
-
- if (!access_ok(VERIFY_WRITE, buf, count))
- return -EFAULT;
-
- error = wait_event_interruptible(debug_log->queue_wait,
- (debug_log->log_start - debug_log->log_end));
-
- if (error)
- return error;
-
- spin_lock_bh(&debug_log->lock);
-
- while ((!error) && (i < count) &&
- (debug_log->log_start != debug_log->log_end)) {
- c = LOG_BUFF(debug_log->log_start);
-
- debug_log->log_start++;
-
- spin_unlock_bh(&debug_log->lock);
-
- error = __put_user(c, buf);
-
- spin_lock_bh(&debug_log->lock);
-
- buf++;
- i++;
-
- }
-
- spin_unlock_bh(&debug_log->lock);
-
- if (!error)
- return i;
-
- return error;
-}
-
-static unsigned int log_poll(struct file *file, poll_table *wait)
-{
- struct bat_priv *bat_priv = file->private_data;
- struct debug_log *debug_log = bat_priv->debug_log;
-
- poll_wait(file, &debug_log->queue_wait, wait);
-
- if (debug_log->log_end - debug_log->log_start)
- return POLLIN | POLLRDNORM;
-
- return 0;
-}
-
-static const struct file_operations log_fops = {
- .open = log_open,
- .release = log_release,
- .read = log_read,
- .poll = log_poll,
- .llseek = no_llseek,
-};
-
-static int debug_log_setup(struct bat_priv *bat_priv)
-{
- struct dentry *d;
-
- if (!bat_priv->debug_dir)
- goto err;
-
- bat_priv->debug_log = kzalloc(sizeof(struct debug_log), GFP_ATOMIC);
- if (!bat_priv->debug_log)
- goto err;
-
- spin_lock_init(&bat_priv->debug_log->lock);
- init_waitqueue_head(&bat_priv->debug_log->queue_wait);
-
- d = debugfs_create_file("log", S_IFREG | S_IRUSR,
- bat_priv->debug_dir, bat_priv, &log_fops);
- if (d)
- goto err;
-
- return 0;
-
-err:
- return 1;
-}
-
-static void debug_log_cleanup(struct bat_priv *bat_priv)
-{
- kfree(bat_priv->debug_log);
- bat_priv->debug_log = NULL;
-}
-#else /* CONFIG_BATMAN_ADV_DEBUG */
-static int debug_log_setup(struct bat_priv *bat_priv)
-{
- bat_priv->debug_log = NULL;
- return 0;
-}
-
-static void debug_log_cleanup(struct bat_priv *bat_priv)
-{
- return;
-}
-#endif
-
-static int originators_open(struct inode *inode, struct file *file)
-{
- struct net_device *net_dev = (struct net_device *)inode->i_private;
- return single_open(file, orig_seq_print_text, net_dev);
-}
-
-static int gateways_open(struct inode *inode, struct file *file)
-{
- struct net_device *net_dev = (struct net_device *)inode->i_private;
- return single_open(file, gw_client_seq_print_text, net_dev);
-}
-
-static int softif_neigh_open(struct inode *inode, struct file *file)
-{
- struct net_device *net_dev = (struct net_device *)inode->i_private;
- return single_open(file, softif_neigh_seq_print_text, net_dev);
-}
-
-static int transtable_global_open(struct inode *inode, struct file *file)
-{
- struct net_device *net_dev = (struct net_device *)inode->i_private;
- return single_open(file, hna_global_seq_print_text, net_dev);
-}
-
-static int transtable_local_open(struct inode *inode, struct file *file)
-{
- struct net_device *net_dev = (struct net_device *)inode->i_private;
- return single_open(file, hna_local_seq_print_text, net_dev);
-}
-
-static int vis_data_open(struct inode *inode, struct file *file)
-{
- struct net_device *net_dev = (struct net_device *)inode->i_private;
- return single_open(file, vis_seq_print_text, net_dev);
-}
-
-struct bat_debuginfo {
- struct attribute attr;
- const struct file_operations fops;
-};
-
-#define BAT_DEBUGINFO(_name, _mode, _open) \
-struct bat_debuginfo bat_debuginfo_##_name = { \
- .attr = { .name = __stringify(_name), \
- .mode = _mode, }, \
- .fops = { .owner = THIS_MODULE, \
- .open = _open, \
- .read = seq_read, \
- .llseek = seq_lseek, \
- .release = single_release, \
- } \
-};
-
-static BAT_DEBUGINFO(originators, S_IRUGO, originators_open);
-static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open);
-static BAT_DEBUGINFO(softif_neigh, S_IRUGO, softif_neigh_open);
-static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open);
-static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open);
-static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open);
-
-static struct bat_debuginfo *mesh_debuginfos[] = {
- &bat_debuginfo_originators,
- &bat_debuginfo_gateways,
- &bat_debuginfo_softif_neigh,
- &bat_debuginfo_transtable_global,
- &bat_debuginfo_transtable_local,
- &bat_debuginfo_vis_data,
- NULL,
-};
-
-void debugfs_init(void)
-{
- bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);
- if (bat_debugfs == ERR_PTR(-ENODEV))
- bat_debugfs = NULL;
-}
-
-void debugfs_destroy(void)
-{
- if (bat_debugfs) {
- debugfs_remove_recursive(bat_debugfs);
- bat_debugfs = NULL;
- }
-}
-
-int debugfs_add_meshif(struct net_device *dev)
-{
- struct bat_priv *bat_priv = netdev_priv(dev);
- struct bat_debuginfo **bat_debug;
- struct dentry *file;
-
- if (!bat_debugfs)
- goto out;
-
- bat_priv->debug_dir = debugfs_create_dir(dev->name, bat_debugfs);
- if (!bat_priv->debug_dir)
- goto out;
-
- bat_socket_setup(bat_priv);
- debug_log_setup(bat_priv);
-
- for (bat_debug = mesh_debuginfos; *bat_debug; ++bat_debug) {
- file = debugfs_create_file(((*bat_debug)->attr).name,
- S_IFREG | ((*bat_debug)->attr).mode,
- bat_priv->debug_dir,
- dev, &(*bat_debug)->fops);
- if (!file) {
- bat_err(dev, "Can't add debugfs file: %s/%s\n",
- dev->name, ((*bat_debug)->attr).name);
- goto rem_attr;
- }
- }
-
- return 0;
-rem_attr:
- debugfs_remove_recursive(bat_priv->debug_dir);
- bat_priv->debug_dir = NULL;
-out:
-#ifdef CONFIG_DEBUG_FS
- return -ENOMEM;
-#else
- return 0;
-#endif /* CONFIG_DEBUG_FS */
-}
-
-void debugfs_del_meshif(struct net_device *dev)
-{
- struct bat_priv *bat_priv = netdev_priv(dev);
-
- debug_log_cleanup(bat_priv);
-
- if (bat_debugfs) {
- debugfs_remove_recursive(bat_priv->debug_dir);
- bat_priv->debug_dir = NULL;
- }
-}
diff --git a/drivers/staging/batman-adv/bat_debugfs.h b/drivers/staging/batman-adv/bat_debugfs.h
deleted file mode 100644
index 72df532..0000000
--- a/drivers/staging/batman-adv/bat_debugfs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-
-#ifndef _NET_BATMAN_ADV_DEBUGFS_H_
-#define _NET_BATMAN_ADV_DEBUGFS_H_
-
-#define DEBUGFS_BAT_SUBDIR "batman_adv"
-
-void debugfs_init(void);
-void debugfs_destroy(void);
-int debugfs_add_meshif(struct net_device *dev);
-void debugfs_del_meshif(struct net_device *dev);
-
-#endif /* _NET_BATMAN_ADV_DEBUGFS_H_ */
diff --git a/drivers/staging/batman-adv/bat_sysfs.c b/drivers/staging/batman-adv/bat_sysfs.c
deleted file mode 100644
index cd7bb51..0000000
--- a/drivers/staging/batman-adv/bat_sysfs.c
+++ /dev/null
@@ -1,593 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "bat_sysfs.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "hard-interface.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "vis.h"
-
-#define to_dev(obj) container_of(obj, struct device, kobj)
-#define kobj_to_netdev(obj) to_net_dev(to_dev(obj->parent))
-#define kobj_to_batpriv(obj) netdev_priv(kobj_to_netdev(obj))
-
-/* Use this, if you have customized show and store functions */
-#define BAT_ATTR(_name, _mode, _show, _store) \
-struct bat_attribute bat_attr_##_name = { \
- .attr = {.name = __stringify(_name), \
- .mode = _mode }, \
- .show = _show, \
- .store = _store, \
-};
-
-#define BAT_ATTR_STORE_BOOL(_name, _post_func) \
-ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \
- char *buff, size_t count) \
-{ \
- struct net_device *net_dev = kobj_to_netdev(kobj); \
- struct bat_priv *bat_priv = netdev_priv(net_dev); \
- return __store_bool_attr(buff, count, _post_func, attr, \
- &bat_priv->_name, net_dev); \
-}
-
-#define BAT_ATTR_SHOW_BOOL(_name) \
-ssize_t show_##_name(struct kobject *kobj, struct attribute *attr, \
- char *buff) \
-{ \
- struct bat_priv *bat_priv = kobj_to_batpriv(kobj); \
- return sprintf(buff, "%s\n", \
- atomic_read(&bat_priv->_name) == 0 ? \
- "disabled" : "enabled"); \
-} \
-
-/* Use this, if you are going to turn a [name] in bat_priv on or off */
-#define BAT_ATTR_BOOL(_name, _mode, _post_func) \
- static BAT_ATTR_STORE_BOOL(_name, _post_func) \
- static BAT_ATTR_SHOW_BOOL(_name) \
- static BAT_ATTR(_name, _mode, show_##_name, store_##_name)
-
-
-#define BAT_ATTR_STORE_UINT(_name, _min, _max, _post_func) \
-ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \
- char *buff, size_t count) \
-{ \
- struct net_device *net_dev = kobj_to_netdev(kobj); \
- struct bat_priv *bat_priv = netdev_priv(net_dev); \
- return __store_uint_attr(buff, count, _min, _max, _post_func, \
- attr, &bat_priv->_name, net_dev); \
-}
-
-#define BAT_ATTR_SHOW_UINT(_name) \
-ssize_t show_##_name(struct kobject *kobj, struct attribute *attr, \
- char *buff) \
-{ \
- struct bat_priv *bat_priv = kobj_to_batpriv(kobj); \
- return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name)); \
-} \
-
-/* Use this, if you are going to set [name] in bat_priv to unsigned integer
- * values only */
-#define BAT_ATTR_UINT(_name, _mode, _min, _max, _post_func) \
- static BAT_ATTR_STORE_UINT(_name, _min, _max, _post_func) \
- static BAT_ATTR_SHOW_UINT(_name) \
- static BAT_ATTR(_name, _mode, show_##_name, store_##_name)
-
-
-static int store_bool_attr(char *buff, size_t count,
- struct net_device *net_dev,
- char *attr_name, atomic_t *attr)
-{
- int enabled = -1;
-
- if (buff[count - 1] == '\n')
- buff[count - 1] = '\0';
-
- if ((strncmp(buff, "1", 2) == 0) ||
- (strncmp(buff, "enable", 7) == 0) ||
- (strncmp(buff, "enabled", 8) == 0))
- enabled = 1;
-
- if ((strncmp(buff, "0", 2) == 0) ||
- (strncmp(buff, "disable", 8) == 0) ||
- (strncmp(buff, "disabled", 9) == 0))
- enabled = 0;
-
- if (enabled < 0) {
- bat_info(net_dev,
- "%s: Invalid parameter received: %s\n",
- attr_name, buff);
- return -EINVAL;
- }
-
- if (atomic_read(attr) == enabled)
- return count;
-
- bat_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,
- atomic_read(attr) == 1 ? "enabled" : "disabled",
- enabled == 1 ? "enabled" : "disabled");
-
- atomic_set(attr, (unsigned)enabled);
- return count;
-}
-
-static inline ssize_t __store_bool_attr(char *buff, size_t count,
- void (*post_func)(struct net_device *),
- struct attribute *attr,
- atomic_t *attr_store, struct net_device *net_dev)
-{
- int ret;
-
- ret = store_bool_attr(buff, count, net_dev, (char *)attr->name,
- attr_store);
- if (post_func && ret)
- post_func(net_dev);
-
- return ret;
-}
-
-static int store_uint_attr(char *buff, size_t count,
- struct net_device *net_dev, char *attr_name,
- unsigned int min, unsigned int max, atomic_t *attr)
-{
- unsigned long uint_val;
- int ret;
-
- ret = strict_strtoul(buff, 10, &uint_val);
- if (ret) {
- bat_info(net_dev,
- "%s: Invalid parameter received: %s\n",
- attr_name, buff);
- return -EINVAL;
- }
-
- if (uint_val < min) {
- bat_info(net_dev, "%s: Value is too small: %lu min: %u\n",
- attr_name, uint_val, min);
- return -EINVAL;
- }
-
- if (uint_val > max) {
- bat_info(net_dev, "%s: Value is too big: %lu max: %u\n",
- attr_name, uint_val, max);
- return -EINVAL;
- }
-
- if (atomic_read(attr) == uint_val)
- return count;
-
- bat_info(net_dev, "%s: Changing from: %i to: %lu\n",
- attr_name, atomic_read(attr), uint_val);
-
- atomic_set(attr, uint_val);
- return count;
-}
-
-static inline ssize_t __store_uint_attr(char *buff, size_t count,
- int min, int max,
- void (*post_func)(struct net_device *),
- struct attribute *attr,
- atomic_t *attr_store, struct net_device *net_dev)
-{
- int ret;
-
- ret = store_uint_attr(buff, count, net_dev, (char *)attr->name,
- min, max, attr_store);
- if (post_func && ret)
- post_func(net_dev);
-
- return ret;
-}
-
-static ssize_t show_vis_mode(struct kobject *kobj, struct attribute *attr,
- char *buff)
-{
- struct bat_priv *bat_priv = kobj_to_batpriv(kobj);
- int vis_mode = atomic_read(&bat_priv->vis_mode);
-
- return sprintf(buff, "%s\n",
- vis_mode == VIS_TYPE_CLIENT_UPDATE ?
- "client" : "server");
-}
-
-static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr,
- char *buff, size_t count)
-{
- struct net_device *net_dev = kobj_to_netdev(kobj);
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- unsigned long val;
- int ret, vis_mode_tmp = -1;
-
- ret = strict_strtoul(buff, 10, &val);
-
- if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) ||
- (strncmp(buff, "client", 6) == 0) ||
- (strncmp(buff, "off", 3) == 0))
- vis_mode_tmp = VIS_TYPE_CLIENT_UPDATE;
-
- if (((count == 2) && (!ret) && (val == VIS_TYPE_SERVER_SYNC)) ||
- (strncmp(buff, "server", 6) == 0))
- vis_mode_tmp = VIS_TYPE_SERVER_SYNC;
-
- if (vis_mode_tmp < 0) {
- if (buff[count - 1] == '\n')
- buff[count - 1] = '\0';
-
- bat_info(net_dev,
- "Invalid parameter for 'vis mode' setting received: "
- "%s\n", buff);
- return -EINVAL;
- }
-
- if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)
- return count;
-
- bat_info(net_dev, "Changing vis mode from: %s to: %s\n",
- atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE ?
- "client" : "server", vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE ?
- "client" : "server");
-
- atomic_set(&bat_priv->vis_mode, (unsigned)vis_mode_tmp);
- return count;
-}
-
-static void post_gw_deselect(struct net_device *net_dev)
-{
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- gw_deselect(bat_priv);
-}
-
-static ssize_t show_gw_mode(struct kobject *kobj, struct attribute *attr,
- char *buff)
-{
- struct bat_priv *bat_priv = kobj_to_batpriv(kobj);
- int bytes_written;
-
- switch (atomic_read(&bat_priv->gw_mode)) {
- case GW_MODE_CLIENT:
- bytes_written = sprintf(buff, "%s\n", GW_MODE_CLIENT_NAME);
- break;
- case GW_MODE_SERVER:
- bytes_written = sprintf(buff, "%s\n", GW_MODE_SERVER_NAME);
- break;
- default:
- bytes_written = sprintf(buff, "%s\n", GW_MODE_OFF_NAME);
- break;
- }
-
- return bytes_written;
-}
-
-static ssize_t store_gw_mode(struct kobject *kobj, struct attribute *attr,
- char *buff, size_t count)
-{
- struct net_device *net_dev = kobj_to_netdev(kobj);
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- char *curr_gw_mode_str;
- int gw_mode_tmp = -1;
-
- if (buff[count - 1] == '\n')
- buff[count - 1] = '\0';
-
- if (strncmp(buff, GW_MODE_OFF_NAME, strlen(GW_MODE_OFF_NAME)) == 0)
- gw_mode_tmp = GW_MODE_OFF;
-
- if (strncmp(buff, GW_MODE_CLIENT_NAME,
- strlen(GW_MODE_CLIENT_NAME)) == 0)
- gw_mode_tmp = GW_MODE_CLIENT;
-
- if (strncmp(buff, GW_MODE_SERVER_NAME,
- strlen(GW_MODE_SERVER_NAME)) == 0)
- gw_mode_tmp = GW_MODE_SERVER;
-
- if (gw_mode_tmp < 0) {
- bat_info(net_dev,
- "Invalid parameter for 'gw mode' setting received: "
- "%s\n", buff);
- return -EINVAL;
- }
-
- if (atomic_read(&bat_priv->gw_mode) == gw_mode_tmp)
- return count;
-
- switch (atomic_read(&bat_priv->gw_mode)) {
- case GW_MODE_CLIENT:
- curr_gw_mode_str = GW_MODE_CLIENT_NAME;
- break;
- case GW_MODE_SERVER:
- curr_gw_mode_str = GW_MODE_SERVER_NAME;
- break;
- default:
- curr_gw_mode_str = GW_MODE_OFF_NAME;
- break;
- }
-
- bat_info(net_dev, "Changing gw mode from: %s to: %s\n",
- curr_gw_mode_str, buff);
-
- gw_deselect(bat_priv);
- atomic_set(&bat_priv->gw_mode, (unsigned)gw_mode_tmp);
- return count;
-}
-
-static ssize_t show_gw_bwidth(struct kobject *kobj, struct attribute *attr,
- char *buff)
-{
- struct bat_priv *bat_priv = kobj_to_batpriv(kobj);
- int down, up;
- int gw_bandwidth = atomic_read(&bat_priv->gw_bandwidth);
-
- gw_bandwidth_to_kbit(gw_bandwidth, &down, &up);
- return sprintf(buff, "%i%s/%i%s\n",
- (down > 2048 ? down / 1024 : down),
- (down > 2048 ? "MBit" : "KBit"),
- (up > 2048 ? up / 1024 : up),
- (up > 2048 ? "MBit" : "KBit"));
-}
-
-static ssize_t store_gw_bwidth(struct kobject *kobj, struct attribute *attr,
- char *buff, size_t count)
-{
- struct net_device *net_dev = kobj_to_netdev(kobj);
-
- if (buff[count - 1] == '\n')
- buff[count - 1] = '\0';
-
- return gw_bandwidth_set(net_dev, buff, count);
-}
-
-BAT_ATTR_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL);
-BAT_ATTR_BOOL(bonding, S_IRUGO | S_IWUSR, NULL);
-BAT_ATTR_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu);
-static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode);
-static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, show_gw_mode, store_gw_mode);
-BAT_ATTR_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL);
-BAT_ATTR_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL);
-BAT_ATTR_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE,
- post_gw_deselect);
-static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, show_gw_bwidth,
- store_gw_bwidth);
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-BAT_ATTR_UINT(log_level, S_IRUGO | S_IWUSR, 0, 3, NULL);
-#endif
-
-static struct bat_attribute *mesh_attrs[] = {
- &bat_attr_aggregated_ogms,
- &bat_attr_bonding,
- &bat_attr_fragmentation,
- &bat_attr_vis_mode,
- &bat_attr_gw_mode,
- &bat_attr_orig_interval,
- &bat_attr_hop_penalty,
- &bat_attr_gw_sel_class,
- &bat_attr_gw_bandwidth,
-#ifdef CONFIG_BATMAN_ADV_DEBUG
- &bat_attr_log_level,
-#endif
- NULL,
-};
-
-int sysfs_add_meshif(struct net_device *dev)
-{
- struct kobject *batif_kobject = &dev->dev.kobj;
- struct bat_priv *bat_priv = netdev_priv(dev);
- struct bat_attribute **bat_attr;
- int err;
-
- bat_priv->mesh_obj = kobject_create_and_add(SYSFS_IF_MESH_SUBDIR,
- batif_kobject);
- if (!bat_priv->mesh_obj) {
- bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
- SYSFS_IF_MESH_SUBDIR);
- goto out;
- }
-
- for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr) {
- err = sysfs_create_file(bat_priv->mesh_obj,
- &((*bat_attr)->attr));
- if (err) {
- bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",
- dev->name, SYSFS_IF_MESH_SUBDIR,
- ((*bat_attr)->attr).name);
- goto rem_attr;
- }
- }
-
- return 0;
-
-rem_attr:
- for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)
- sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
- kobject_put(bat_priv->mesh_obj);
- bat_priv->mesh_obj = NULL;
-out:
- return -ENOMEM;
-}
-
-void sysfs_del_meshif(struct net_device *dev)
-{
- struct bat_priv *bat_priv = netdev_priv(dev);
- struct bat_attribute **bat_attr;
-
- for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)
- sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));
-
- kobject_put(bat_priv->mesh_obj);
- bat_priv->mesh_obj = NULL;
-}
-
-static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr,
- char *buff)
-{
- struct net_device *net_dev = kobj_to_netdev(kobj);
- struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
- ssize_t length;
-
- if (!batman_if)
- return 0;
-
- length = sprintf(buff, "%s\n", batman_if->if_status == IF_NOT_IN_USE ?
- "none" : batman_if->soft_iface->name);
-
- kref_put(&batman_if->refcount, hardif_free_ref);
-
- return length;
-}
-
-static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,
- char *buff, size_t count)
-{
- struct net_device *net_dev = kobj_to_netdev(kobj);
- struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
- int status_tmp = -1;
- int ret;
-
- if (!batman_if)
- return count;
-
- if (buff[count - 1] == '\n')
- buff[count - 1] = '\0';
-
- if (strlen(buff) >= IFNAMSIZ) {
- pr_err("Invalid parameter for 'mesh_iface' setting received: "
- "interface name too long '%s'\n", buff);
- kref_put(&batman_if->refcount, hardif_free_ref);
- return -EINVAL;
- }
-
- if (strncmp(buff, "none", 4) == 0)
- status_tmp = IF_NOT_IN_USE;
- else
- status_tmp = IF_I_WANT_YOU;
-
- if ((batman_if->if_status == status_tmp) || ((batman_if->soft_iface) &&
- (strncmp(batman_if->soft_iface->name, buff, IFNAMSIZ) == 0))) {
- kref_put(&batman_if->refcount, hardif_free_ref);
- return count;
- }
-
- if (status_tmp == IF_NOT_IN_USE) {
- rtnl_lock();
- hardif_disable_interface(batman_if);
- rtnl_unlock();
- kref_put(&batman_if->refcount, hardif_free_ref);
- return count;
- }
-
- /* if the interface already is in use */
- if (batman_if->if_status != IF_NOT_IN_USE) {
- rtnl_lock();
- hardif_disable_interface(batman_if);
- rtnl_unlock();
- }
-
- ret = hardif_enable_interface(batman_if, buff);
- kref_put(&batman_if->refcount, hardif_free_ref);
-
- return ret;
-}
-
-static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr,
- char *buff)
-{
- struct net_device *net_dev = kobj_to_netdev(kobj);
- struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
- ssize_t length;
-
- if (!batman_if)
- return 0;
-
- switch (batman_if->if_status) {
- case IF_TO_BE_REMOVED:
- length = sprintf(buff, "disabling\n");
- break;
- case IF_INACTIVE:
- length = sprintf(buff, "inactive\n");
- break;
- case IF_ACTIVE:
- length = sprintf(buff, "active\n");
- break;
- case IF_TO_BE_ACTIVATED:
- length = sprintf(buff, "enabling\n");
- break;
- case IF_NOT_IN_USE:
- default:
- length = sprintf(buff, "not in use\n");
- break;
- }
-
- kref_put(&batman_if->refcount, hardif_free_ref);
-
- return length;
-}
-
-static BAT_ATTR(mesh_iface, S_IRUGO | S_IWUSR,
- show_mesh_iface, store_mesh_iface);
-static BAT_ATTR(iface_status, S_IRUGO, show_iface_status, NULL);
-
-static struct bat_attribute *batman_attrs[] = {
- &bat_attr_mesh_iface,
- &bat_attr_iface_status,
- NULL,
-};
-
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev)
-{
- struct kobject *hardif_kobject = &dev->dev.kobj;
- struct bat_attribute **bat_attr;
- int err;
-
- *hardif_obj = kobject_create_and_add(SYSFS_IF_BAT_SUBDIR,
- hardif_kobject);
-
- if (!*hardif_obj) {
- bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,
- SYSFS_IF_BAT_SUBDIR);
- goto out;
- }
-
- for (bat_attr = batman_attrs; *bat_attr; ++bat_attr) {
- err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));
- if (err) {
- bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",
- dev->name, SYSFS_IF_BAT_SUBDIR,
- ((*bat_attr)->attr).name);
- goto rem_attr;
- }
- }
-
- return 0;
-
-rem_attr:
- for (bat_attr = batman_attrs; *bat_attr; ++bat_attr)
- sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr));
-out:
- return -ENOMEM;
-}
-
-void sysfs_del_hardif(struct kobject **hardif_obj)
-{
- kobject_put(*hardif_obj);
- *hardif_obj = NULL;
-}
diff --git a/drivers/staging/batman-adv/bat_sysfs.h b/drivers/staging/batman-adv/bat_sysfs.h
deleted file mode 100644
index 7f186c0..0000000
--- a/drivers/staging/batman-adv/bat_sysfs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-
-#ifndef _NET_BATMAN_ADV_SYSFS_H_
-#define _NET_BATMAN_ADV_SYSFS_H_
-
-#define SYSFS_IF_MESH_SUBDIR "mesh"
-#define SYSFS_IF_BAT_SUBDIR "batman_adv"
-
-struct bat_attribute {
- struct attribute attr;
- ssize_t (*show)(struct kobject *kobj, struct attribute *attr,
- char *buf);
- ssize_t (*store)(struct kobject *kobj, struct attribute *attr,
- char *buf, size_t count);
-};
-
-int sysfs_add_meshif(struct net_device *dev);
-void sysfs_del_meshif(struct net_device *dev);
-int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev);
-void sysfs_del_hardif(struct kobject **hardif_obj);
-
-#endif /* _NET_BATMAN_ADV_SYSFS_H_ */
diff --git a/drivers/staging/batman-adv/bitarray.c b/drivers/staging/batman-adv/bitarray.c
deleted file mode 100644
index 814274f..0000000
--- a/drivers/staging/batman-adv/bitarray.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "bitarray.h"
-
-#include <linux/bitops.h>
-
-/* returns true if the corresponding bit in the given seq_bits indicates true
- * and curr_seqno is within range of last_seqno */
-uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno,
- uint32_t curr_seqno)
-{
- int32_t diff, word_offset, word_num;
-
- diff = last_seqno - curr_seqno;
- if (diff < 0 || diff >= TQ_LOCAL_WINDOW_SIZE) {
- return 0;
- } else {
- /* which word */
- word_num = (last_seqno - curr_seqno) / WORD_BIT_SIZE;
- /* which position in the selected word */
- word_offset = (last_seqno - curr_seqno) % WORD_BIT_SIZE;
-
- if (seq_bits[word_num] & 1 << word_offset)
- return 1;
- else
- return 0;
- }
-}
-
-/* turn corresponding bit on, so we can remember that we got the packet */
-void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n)
-{
- int32_t word_offset, word_num;
-
- /* if too old, just drop it */
- if (n < 0 || n >= TQ_LOCAL_WINDOW_SIZE)
- return;
-
- /* which word */
- word_num = n / WORD_BIT_SIZE;
- /* which position in the selected word */
- word_offset = n % WORD_BIT_SIZE;
-
- seq_bits[word_num] |= 1 << word_offset; /* turn the position on */
-}
-
-/* shift the packet array by n places. */
-static void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n)
-{
- int32_t word_offset, word_num;
- int32_t i;
-
- if (n <= 0 || n >= TQ_LOCAL_WINDOW_SIZE)
- return;
-
- word_offset = n % WORD_BIT_SIZE;/* shift how much inside each word */
- word_num = n / WORD_BIT_SIZE; /* shift over how much (full) words */
-
- for (i = NUM_WORDS - 1; i > word_num; i--) {
- /* going from old to new, so we don't overwrite the data we copy
- * from.
- *
- * left is high, right is low: FEDC BA98 7654 3210
- * ^^ ^^
- * vvvv
- * ^^^^ = from, vvvvv =to, we'd have word_num==1 and
- * word_offset==WORD_BIT_SIZE/2 ????? in this example.
- * (=24 bits)
- *
- * our desired output would be: 9876 5432 1000 0000
- * */
-
- seq_bits[i] =
- (seq_bits[i - word_num] << word_offset) +
- /* take the lower port from the left half, shift it left
- * to its final position */
- (seq_bits[i - word_num - 1] >>
- (WORD_BIT_SIZE-word_offset));
- /* and the upper part of the right half and shift it left to
- * it's position */
- /* for our example that would be: word[0] = 9800 + 0076 =
- * 9876 */
- }
- /* now for our last word, i==word_num, we only have the it's "left"
- * half. that's the 1000 word in our example.*/
-
- seq_bits[i] = (seq_bits[i - word_num] << word_offset);
-
- /* pad the rest with 0, if there is anything */
- i--;
-
- for (; i >= 0; i--)
- seq_bits[i] = 0;
-}
-
-static void bit_reset_window(TYPE_OF_WORD *seq_bits)
-{
- int i;
- for (i = 0; i < NUM_WORDS; i++)
- seq_bits[i] = 0;
-}
-
-
-/* receive and process one packet within the sequence number window.
- *
- * returns:
- * 1 if the window was moved (either new or very old)
- * 0 if the window was not moved/shifted.
- */
-char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits,
- int32_t seq_num_diff, int8_t set_mark)
-{
- struct bat_priv *bat_priv = (struct bat_priv *)priv;
-
- /* sequence number is slightly older. We already got a sequence number
- * higher than this one, so we just mark it. */
-
- if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) {
- if (set_mark)
- bit_mark(seq_bits, -seq_num_diff);
- return 0;
- }
-
- /* sequence number is slightly newer, so we shift the window and
- * set the mark if required */
-
- if ((seq_num_diff > 0) && (seq_num_diff < TQ_LOCAL_WINDOW_SIZE)) {
- bit_shift(seq_bits, seq_num_diff);
-
- if (set_mark)
- bit_mark(seq_bits, 0);
- return 1;
- }
-
- /* sequence number is much newer, probably missed a lot of packets */
-
- if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE)
- || (seq_num_diff < EXPECTED_SEQNO_RANGE)) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "We missed a lot of packets (%i) !\n",
- seq_num_diff - 1);
- bit_reset_window(seq_bits);
- if (set_mark)
- bit_mark(seq_bits, 0);
- return 1;
- }
-
- /* received a much older packet. The other host either restarted
- * or the old packet got delayed somewhere in the network. The
- * packet should be dropped without calling this function if the
- * seqno window is protected. */
-
- if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)
- || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Other host probably restarted!\n");
-
- bit_reset_window(seq_bits);
- if (set_mark)
- bit_mark(seq_bits, 0);
-
- return 1;
- }
-
- /* never reached */
- return 0;
-}
-
-/* count the hamming weight, how many good packets did we receive? just count
- * the 1's.
- */
-int bit_packet_count(TYPE_OF_WORD *seq_bits)
-{
- int i, hamming = 0;
-
- for (i = 0; i < NUM_WORDS; i++)
- hamming += hweight_long(seq_bits[i]);
-
- return hamming;
-}
diff --git a/drivers/staging/batman-adv/bitarray.h b/drivers/staging/batman-adv/bitarray.h
deleted file mode 100644
index 77b1e61..0000000
--- a/drivers/staging/batman-adv/bitarray.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_BITARRAY_H_
-#define _NET_BATMAN_ADV_BITARRAY_H_
-
-/* you should choose something big, if you don't want to waste cpu
- * and keep the type in sync with bit_packet_count */
-#define TYPE_OF_WORD unsigned long
-#define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8)
-
-/* returns true if the corresponding bit in the given seq_bits indicates true
- * and curr_seqno is within range of last_seqno */
-uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint32_t last_seqno,
- uint32_t curr_seqno);
-
-/* turn corresponding bit on, so we can remember that we got the packet */
-void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n);
-
-
-/* receive and process one packet, returns 1 if received seq_num is considered
- * new, 0 if old */
-char bit_get_packet(void *priv, TYPE_OF_WORD *seq_bits,
- int32_t seq_num_diff, int8_t set_mark);
-
-/* count the hamming weight, how many good packets did we receive? */
-int bit_packet_count(TYPE_OF_WORD *seq_bits);
-
-#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */
diff --git a/drivers/staging/batman-adv/gateway_client.c b/drivers/staging/batman-adv/gateway_client.c
deleted file mode 100644
index 0065ffb..0000000
--- a/drivers/staging/batman-adv/gateway_client.c
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "gateway_client.h"
-#include "gateway_common.h"
-#include "hard-interface.h"
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <linux/udp.h>
-#include <linux/if_vlan.h>
-
-static void gw_node_free_ref(struct kref *refcount)
-{
- struct gw_node *gw_node;
-
- gw_node = container_of(refcount, struct gw_node, refcount);
- kfree(gw_node);
-}
-
-static void gw_node_free_rcu(struct rcu_head *rcu)
-{
- struct gw_node *gw_node;
-
- gw_node = container_of(rcu, struct gw_node, rcu);
- kref_put(&gw_node->refcount, gw_node_free_ref);
-}
-
-void *gw_get_selected(struct bat_priv *bat_priv)
-{
- struct gw_node *curr_gateway_tmp = bat_priv->curr_gw;
-
- if (!curr_gateway_tmp)
- return NULL;
-
- return curr_gateway_tmp->orig_node;
-}
-
-void gw_deselect(struct bat_priv *bat_priv)
-{
- struct gw_node *gw_node = bat_priv->curr_gw;
-
- bat_priv->curr_gw = NULL;
-
- if (gw_node)
- kref_put(&gw_node->refcount, gw_node_free_ref);
-}
-
-static struct gw_node *gw_select(struct bat_priv *bat_priv,
- struct gw_node *new_gw_node)
-{
- struct gw_node *curr_gw_node = bat_priv->curr_gw;
-
- if (new_gw_node)
- kref_get(&new_gw_node->refcount);
-
- bat_priv->curr_gw = new_gw_node;
- return curr_gw_node;
-}
-
-void gw_election(struct bat_priv *bat_priv)
-{
- struct hlist_node *node;
- struct gw_node *gw_node, *curr_gw_tmp = NULL, *old_gw_node = NULL;
- uint8_t max_tq = 0;
- uint32_t max_gw_factor = 0, tmp_gw_factor = 0;
- int down, up;
-
- /**
- * The batman daemon checks here if we already passed a full originator
- * cycle in order to make sure we don't choose the first gateway we
- * hear about. This check is based on the daemon's uptime which we
- * don't have.
- **/
- if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT)
- return;
-
- if (bat_priv->curr_gw)
- return;
-
- rcu_read_lock();
- if (hlist_empty(&bat_priv->gw_list)) {
- rcu_read_unlock();
-
- if (bat_priv->curr_gw) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Removing selected gateway - "
- "no gateway in range\n");
- gw_deselect(bat_priv);
- }
-
- return;
- }
-
- hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) {
- if (!gw_node->orig_node->router)
- continue;
-
- if (gw_node->deleted)
- continue;
-
- switch (atomic_read(&bat_priv->gw_sel_class)) {
- case 1: /* fast connection */
- gw_bandwidth_to_kbit(gw_node->orig_node->gw_flags,
- &down, &up);
-
- tmp_gw_factor = (gw_node->orig_node->router->tq_avg *
- gw_node->orig_node->router->tq_avg *
- down * 100 * 100) /
- (TQ_LOCAL_WINDOW_SIZE *
- TQ_LOCAL_WINDOW_SIZE * 64);
-
- if ((tmp_gw_factor > max_gw_factor) ||
- ((tmp_gw_factor == max_gw_factor) &&
- (gw_node->orig_node->router->tq_avg > max_tq)))
- curr_gw_tmp = gw_node;
- break;
-
- default: /**
- * 2: stable connection (use best statistic)
- * 3: fast-switch (use best statistic but change as
- * soon as a better gateway appears)
- * XX: late-switch (use best statistic but change as
- * soon as a better gateway appears which has
- * $routing_class more tq points)
- **/
- if (gw_node->orig_node->router->tq_avg > max_tq)
- curr_gw_tmp = gw_node;
- break;
- }
-
- if (gw_node->orig_node->router->tq_avg > max_tq)
- max_tq = gw_node->orig_node->router->tq_avg;
-
- if (tmp_gw_factor > max_gw_factor)
- max_gw_factor = tmp_gw_factor;
- }
-
- if (bat_priv->curr_gw != curr_gw_tmp) {
- if ((bat_priv->curr_gw) && (!curr_gw_tmp))
- bat_dbg(DBG_BATMAN, bat_priv,
- "Removing selected gateway - "
- "no gateway in range\n");
- else if ((!bat_priv->curr_gw) && (curr_gw_tmp))
- bat_dbg(DBG_BATMAN, bat_priv,
- "Adding route to gateway %pM "
- "(gw_flags: %i, tq: %i)\n",
- curr_gw_tmp->orig_node->orig,
- curr_gw_tmp->orig_node->gw_flags,
- curr_gw_tmp->orig_node->router->tq_avg);
- else
- bat_dbg(DBG_BATMAN, bat_priv,
- "Changing route to gateway %pM "
- "(gw_flags: %i, tq: %i)\n",
- curr_gw_tmp->orig_node->orig,
- curr_gw_tmp->orig_node->gw_flags,
- curr_gw_tmp->orig_node->router->tq_avg);
-
- old_gw_node = gw_select(bat_priv, curr_gw_tmp);
- }
-
- rcu_read_unlock();
-
- /* the kfree() has to be outside of the rcu lock */
- if (old_gw_node)
- kref_put(&old_gw_node->refcount, gw_node_free_ref);
-}
-
-void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node)
-{
- struct gw_node *curr_gateway_tmp = bat_priv->curr_gw;
- uint8_t gw_tq_avg, orig_tq_avg;
-
- if (!curr_gateway_tmp)
- return;
-
- if (!curr_gateway_tmp->orig_node)
- goto deselect;
-
- if (!curr_gateway_tmp->orig_node->router)
- goto deselect;
-
- /* this node already is the gateway */
- if (curr_gateway_tmp->orig_node == orig_node)
- return;
-
- if (!orig_node->router)
- return;
-
- gw_tq_avg = curr_gateway_tmp->orig_node->router->tq_avg;
- orig_tq_avg = orig_node->router->tq_avg;
-
- /* the TQ value has to be better */
- if (orig_tq_avg < gw_tq_avg)
- return;
-
- /**
- * if the routing class is greater than 3 the value tells us how much
- * greater the TQ value of the new gateway must be
- **/
- if ((atomic_read(&bat_priv->gw_sel_class) > 3) &&
- (orig_tq_avg - gw_tq_avg < atomic_read(&bat_priv->gw_sel_class)))
- return;
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Restarting gateway selection: better gateway found (tq curr: "
- "%i, tq new: %i)\n",
- gw_tq_avg, orig_tq_avg);
-
-deselect:
- gw_deselect(bat_priv);
-}
-
-static void gw_node_add(struct bat_priv *bat_priv,
- struct orig_node *orig_node, uint8_t new_gwflags)
-{
- struct gw_node *gw_node;
- int down, up;
-
- gw_node = kmalloc(sizeof(struct gw_node), GFP_ATOMIC);
- if (!gw_node)
- return;
-
- memset(gw_node, 0, sizeof(struct gw_node));
- INIT_HLIST_NODE(&gw_node->list);
- gw_node->orig_node = orig_node;
- kref_init(&gw_node->refcount);
-
- spin_lock_bh(&bat_priv->gw_list_lock);
- hlist_add_head_rcu(&gw_node->list, &bat_priv->gw_list);
- spin_unlock_bh(&bat_priv->gw_list_lock);
-
- gw_bandwidth_to_kbit(new_gwflags, &down, &up);
- bat_dbg(DBG_BATMAN, bat_priv,
- "Found new gateway %pM -> gw_class: %i - %i%s/%i%s\n",
- orig_node->orig, new_gwflags,
- (down > 2048 ? down / 1024 : down),
- (down > 2048 ? "MBit" : "KBit"),
- (up > 2048 ? up / 1024 : up),
- (up > 2048 ? "MBit" : "KBit"));
-}
-
-void gw_node_update(struct bat_priv *bat_priv,
- struct orig_node *orig_node, uint8_t new_gwflags)
-{
- struct hlist_node *node;
- struct gw_node *gw_node;
-
- rcu_read_lock();
- hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) {
- if (gw_node->orig_node != orig_node)
- continue;
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Gateway class of originator %pM changed from "
- "%i to %i\n",
- orig_node->orig, gw_node->orig_node->gw_flags,
- new_gwflags);
-
- gw_node->deleted = 0;
-
- if (new_gwflags == 0) {
- gw_node->deleted = jiffies;
- bat_dbg(DBG_BATMAN, bat_priv,
- "Gateway %pM removed from gateway list\n",
- orig_node->orig);
-
- if (gw_node == bat_priv->curr_gw) {
- rcu_read_unlock();
- gw_deselect(bat_priv);
- return;
- }
- }
-
- rcu_read_unlock();
- return;
- }
- rcu_read_unlock();
-
- if (new_gwflags == 0)
- return;
-
- gw_node_add(bat_priv, orig_node, new_gwflags);
-}
-
-void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node)
-{
- return gw_node_update(bat_priv, orig_node, 0);
-}
-
-void gw_node_purge(struct bat_priv *bat_priv)
-{
- struct gw_node *gw_node;
- struct hlist_node *node, *node_tmp;
- unsigned long timeout = 2 * PURGE_TIMEOUT * HZ;
-
- spin_lock_bh(&bat_priv->gw_list_lock);
-
- hlist_for_each_entry_safe(gw_node, node, node_tmp,
- &bat_priv->gw_list, list) {
- if (((!gw_node->deleted) ||
- (time_before(jiffies, gw_node->deleted + timeout))) &&
- atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)
- continue;
-
- if (bat_priv->curr_gw == gw_node)
- gw_deselect(bat_priv);
-
- hlist_del_rcu(&gw_node->list);
- call_rcu(&gw_node->rcu, gw_node_free_rcu);
- }
-
-
- spin_unlock_bh(&bat_priv->gw_list_lock);
-}
-
-static int _write_buffer_text(struct bat_priv *bat_priv,
- struct seq_file *seq, struct gw_node *gw_node)
-{
- int down, up;
-
- gw_bandwidth_to_kbit(gw_node->orig_node->gw_flags, &down, &up);
-
- return seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %3i - %i%s/%i%s\n",
- (bat_priv->curr_gw == gw_node ? "=>" : " "),
- gw_node->orig_node->orig,
- gw_node->orig_node->router->tq_avg,
- gw_node->orig_node->router->addr,
- gw_node->orig_node->router->if_incoming->net_dev->name,
- gw_node->orig_node->gw_flags,
- (down > 2048 ? down / 1024 : down),
- (down > 2048 ? "MBit" : "KBit"),
- (up > 2048 ? up / 1024 : up),
- (up > 2048 ? "MBit" : "KBit"));
-}
-
-int gw_client_seq_print_text(struct seq_file *seq, void *offset)
-{
- struct net_device *net_dev = (struct net_device *)seq->private;
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- struct gw_node *gw_node;
- struct hlist_node *node;
- int gw_count = 0;
-
- if (!bat_priv->primary_if) {
-
- return seq_printf(seq, "BATMAN mesh %s disabled - please "
- "specify interfaces to enable it\n",
- net_dev->name);
- }
-
- if (bat_priv->primary_if->if_status != IF_ACTIVE) {
-
- return seq_printf(seq, "BATMAN mesh %s disabled - "
- "primary interface not active\n",
- net_dev->name);
- }
-
- seq_printf(seq, " %-12s (%s/%i) %17s [%10s]: gw_class ... "
- "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n",
- "Gateway", "#", TQ_MAX_VALUE, "Nexthop",
- "outgoingIF", SOURCE_VERSION, REVISION_VERSION_STR,
- bat_priv->primary_if->net_dev->name,
- bat_priv->primary_if->net_dev->dev_addr, net_dev->name);
-
- rcu_read_lock();
- hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) {
- if (gw_node->deleted)
- continue;
-
- if (!gw_node->orig_node->router)
- continue;
-
- _write_buffer_text(bat_priv, seq, gw_node);
- gw_count++;
- }
- rcu_read_unlock();
-
- if (gw_count == 0)
- seq_printf(seq, "No gateways in range ...\n");
-
- return 0;
-}
-
-int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb)
-{
- struct ethhdr *ethhdr;
- struct iphdr *iphdr;
- struct ipv6hdr *ipv6hdr;
- struct udphdr *udphdr;
- unsigned int header_len = 0;
-
- if (atomic_read(&bat_priv->gw_mode) == GW_MODE_OFF)
- return 0;
-
- /* check for ethernet header */
- if (!pskb_may_pull(skb, header_len + ETH_HLEN))
- return 0;
- ethhdr = (struct ethhdr *)skb->data;
- header_len += ETH_HLEN;
-
- /* check for initial vlan header */
- if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) {
- if (!pskb_may_pull(skb, header_len + VLAN_HLEN))
- return 0;
- ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN);
- header_len += VLAN_HLEN;
- }
-
- /* check for ip header */
- switch (ntohs(ethhdr->h_proto)) {
- case ETH_P_IP:
- if (!pskb_may_pull(skb, header_len + sizeof(struct iphdr)))
- return 0;
- iphdr = (struct iphdr *)(skb->data + header_len);
- header_len += iphdr->ihl * 4;
-
- /* check for udp header */
- if (iphdr->protocol != IPPROTO_UDP)
- return 0;
-
- break;
- case ETH_P_IPV6:
- if (!pskb_may_pull(skb, header_len + sizeof(struct ipv6hdr)))
- return 0;
- ipv6hdr = (struct ipv6hdr *)(skb->data + header_len);
- header_len += sizeof(struct ipv6hdr);
-
- /* check for udp header */
- if (ipv6hdr->nexthdr != IPPROTO_UDP)
- return 0;
-
- break;
- default:
- return 0;
- }
-
- if (!pskb_may_pull(skb, header_len + sizeof(struct udphdr)))
- return 0;
- udphdr = (struct udphdr *)(skb->data + header_len);
- header_len += sizeof(struct udphdr);
-
- /* check for bootp port */
- if ((ntohs(ethhdr->h_proto) == ETH_P_IP) &&
- (ntohs(udphdr->dest) != 67))
- return 0;
-
- if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) &&
- (ntohs(udphdr->dest) != 547))
- return 0;
-
- if (atomic_read(&bat_priv->gw_mode) == GW_MODE_SERVER)
- return -1;
-
- if (!bat_priv->curr_gw)
- return 0;
-
- return 1;
-}
diff --git a/drivers/staging/batman-adv/gateway_client.h b/drivers/staging/batman-adv/gateway_client.h
deleted file mode 100644
index 4585e65..0000000
--- a/drivers/staging/batman-adv/gateway_client.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
-#define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
-
-void gw_deselect(struct bat_priv *bat_priv);
-void gw_election(struct bat_priv *bat_priv);
-void *gw_get_selected(struct bat_priv *bat_priv);
-void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node);
-void gw_node_update(struct bat_priv *bat_priv,
- struct orig_node *orig_node, uint8_t new_gwflags);
-void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node);
-void gw_node_purge(struct bat_priv *bat_priv);
-int gw_client_seq_print_text(struct seq_file *seq, void *offset);
-int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb);
-
-#endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
diff --git a/drivers/staging/batman-adv/gateway_common.c b/drivers/staging/batman-adv/gateway_common.c
deleted file mode 100644
index b962982..0000000
--- a/drivers/staging/batman-adv/gateway_common.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-
-/* calculates the gateway class from kbit */
-static void kbit_to_gw_bandwidth(int down, int up, long *gw_srv_class)
-{
- int mdown = 0, tdown, tup, difference;
- uint8_t sbit, part;
-
- *gw_srv_class = 0;
- difference = 0x0FFFFFFF;
-
- /* test all downspeeds */
- for (sbit = 0; sbit < 2; sbit++) {
- for (part = 0; part < 16; part++) {
- tdown = 32 * (sbit + 2) * (1 << part);
-
- if (abs(tdown - down) < difference) {
- *gw_srv_class = (sbit << 7) + (part << 3);
- difference = abs(tdown - down);
- mdown = tdown;
- }
- }
- }
-
- /* test all upspeeds */
- difference = 0x0FFFFFFF;
-
- for (part = 0; part < 8; part++) {
- tup = ((part + 1) * (mdown)) / 8;
-
- if (abs(tup - up) < difference) {
- *gw_srv_class = (*gw_srv_class & 0xF8) | part;
- difference = abs(tup - up);
- }
- }
-}
-
-/* returns the up and downspeeds in kbit, calculated from the class */
-void gw_bandwidth_to_kbit(uint8_t gw_srv_class, int *down, int *up)
-{
- char sbit = (gw_srv_class & 0x80) >> 7;
- char dpart = (gw_srv_class & 0x78) >> 3;
- char upart = (gw_srv_class & 0x07);
-
- if (!gw_srv_class) {
- *down = 0;
- *up = 0;
- return;
- }
-
- *down = 32 * (sbit + 2) * (1 << dpart);
- *up = ((upart + 1) * (*down)) / 8;
-}
-
-static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff,
- long *up, long *down)
-{
- int ret, multi = 1;
- char *slash_ptr, *tmp_ptr;
-
- slash_ptr = strchr(buff, '/');
- if (slash_ptr)
- *slash_ptr = 0;
-
- if (strlen(buff) > 4) {
- tmp_ptr = buff + strlen(buff) - 4;
-
- if (strnicmp(tmp_ptr, "mbit", 4) == 0)
- multi = 1024;
-
- if ((strnicmp(tmp_ptr, "kbit", 4) == 0) ||
- (multi > 1))
- *tmp_ptr = '\0';
- }
-
- ret = strict_strtoul(buff, 10, down);
- if (ret) {
- bat_err(net_dev,
- "Download speed of gateway mode invalid: %s\n",
- buff);
- return false;
- }
-
- *down *= multi;
-
- /* we also got some upload info */
- if (slash_ptr) {
- multi = 1;
-
- if (strlen(slash_ptr + 1) > 4) {
- tmp_ptr = slash_ptr + 1 - 4 + strlen(slash_ptr + 1);
-
- if (strnicmp(tmp_ptr, "mbit", 4) == 0)
- multi = 1024;
-
- if ((strnicmp(tmp_ptr, "kbit", 4) == 0) ||
- (multi > 1))
- *tmp_ptr = '\0';
- }
-
- ret = strict_strtoul(slash_ptr + 1, 10, up);
- if (ret) {
- bat_err(net_dev,
- "Upload speed of gateway mode invalid: "
- "%s\n", slash_ptr + 1);
- return false;
- }
-
- *up *= multi;
- }
-
- return true;
-}
-
-ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count)
-{
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- long gw_bandwidth_tmp = 0, up = 0, down = 0;
- bool ret;
-
- ret = parse_gw_bandwidth(net_dev, buff, &up, &down);
- if (!ret)
- goto end;
-
- if ((!down) || (down < 256))
- down = 2000;
-
- if (!up)
- up = down / 5;
-
- kbit_to_gw_bandwidth(down, up, &gw_bandwidth_tmp);
-
- /**
- * the gw bandwidth we guessed above might not match the given
- * speeds, hence we need to calculate it back to show the number
- * that is going to be propagated
- **/
- gw_bandwidth_to_kbit((uint8_t)gw_bandwidth_tmp,
- (int *)&down, (int *)&up);
-
- gw_deselect(bat_priv);
- bat_info(net_dev, "Changing gateway bandwidth from: '%i' to: '%ld' "
- "(propagating: %ld%s/%ld%s)\n",
- atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,
- (down > 2048 ? down / 1024 : down),
- (down > 2048 ? "MBit" : "KBit"),
- (up > 2048 ? up / 1024 : up),
- (up > 2048 ? "MBit" : "KBit"));
-
- atomic_set(&bat_priv->gw_bandwidth, gw_bandwidth_tmp);
-
-end:
- return count;
-}
diff --git a/drivers/staging/batman-adv/gateway_common.h b/drivers/staging/batman-adv/gateway_common.h
deleted file mode 100644
index 5e728d0..0000000
--- a/drivers/staging/batman-adv/gateway_common.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_
-#define _NET_BATMAN_ADV_GATEWAY_COMMON_H_
-
-enum gw_modes {
- GW_MODE_OFF,
- GW_MODE_CLIENT,
- GW_MODE_SERVER,
-};
-
-#define GW_MODE_OFF_NAME "off"
-#define GW_MODE_CLIENT_NAME "client"
-#define GW_MODE_SERVER_NAME "server"
-
-void gw_bandwidth_to_kbit(uint8_t gw_class, int *down, int *up);
-ssize_t gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count);
-
-#endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */
diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c
deleted file mode 100644
index bf98b90..0000000
--- a/drivers/staging/batman-adv/hard-interface.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "hard-interface.h"
-#include "soft-interface.h"
-#include "send.h"
-#include "translation-table.h"
-#include "routing.h"
-#include "bat_sysfs.h"
-#include "originator.h"
-#include "hash.h"
-
-#include <linux/if_arp.h>
-
-/* protect update critical side of if_list - but not the content */
-static DEFINE_SPINLOCK(if_list_lock);
-
-static void hardif_free_rcu(struct rcu_head *rcu)
-{
- struct batman_if *batman_if;
-
- batman_if = container_of(rcu, struct batman_if, rcu);
- dev_put(batman_if->net_dev);
- kref_put(&batman_if->refcount, hardif_free_ref);
-}
-
-struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev)
-{
- struct batman_if *batman_if;
-
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if (batman_if->net_dev == net_dev)
- goto out;
- }
-
- batman_if = NULL;
-
-out:
- if (batman_if)
- kref_get(&batman_if->refcount);
-
- rcu_read_unlock();
- return batman_if;
-}
-
-static int is_valid_iface(struct net_device *net_dev)
-{
- if (net_dev->flags & IFF_LOOPBACK)
- return 0;
-
- if (net_dev->type != ARPHRD_ETHER)
- return 0;
-
- if (net_dev->addr_len != ETH_ALEN)
- return 0;
-
- /* no batman over batman */
-#ifdef HAVE_NET_DEVICE_OPS
- if (net_dev->netdev_ops->ndo_start_xmit == interface_tx)
- return 0;
-#else
- if (net_dev->hard_start_xmit == interface_tx)
- return 0;
-#endif
-
- /* Device is being bridged */
- /* if (net_dev->priv_flags & IFF_BRIDGE_PORT)
- return 0; */
-
- return 1;
-}
-
-static struct batman_if *get_active_batman_if(struct net_device *soft_iface)
-{
- struct batman_if *batman_if;
-
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if (batman_if->soft_iface != soft_iface)
- continue;
-
- if (batman_if->if_status == IF_ACTIVE)
- goto out;
- }
-
- batman_if = NULL;
-
-out:
- if (batman_if)
- kref_get(&batman_if->refcount);
-
- rcu_read_unlock();
- return batman_if;
-}
-
-static void update_primary_addr(struct bat_priv *bat_priv)
-{
- struct vis_packet *vis_packet;
-
- vis_packet = (struct vis_packet *)
- bat_priv->my_vis_info->skb_packet->data;
- memcpy(vis_packet->vis_orig,
- bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
- memcpy(vis_packet->sender_orig,
- bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-}
-
-static void set_primary_if(struct bat_priv *bat_priv,
- struct batman_if *batman_if)
-{
- struct batman_packet *batman_packet;
- struct batman_if *old_if;
-
- if (batman_if)
- kref_get(&batman_if->refcount);
-
- old_if = bat_priv->primary_if;
- bat_priv->primary_if = batman_if;
-
- if (old_if)
- kref_put(&old_if->refcount, hardif_free_ref);
-
- if (!bat_priv->primary_if)
- return;
-
- batman_packet = (struct batman_packet *)(batman_if->packet_buff);
- batman_packet->flags = PRIMARIES_FIRST_HOP;
- batman_packet->ttl = TTL;
-
- update_primary_addr(bat_priv);
-
- /***
- * hacky trick to make sure that we send the HNA information via
- * our new primary interface
- */
- atomic_set(&bat_priv->hna_local_changed, 1);
-}
-
-static bool hardif_is_iface_up(struct batman_if *batman_if)
-{
- if (batman_if->net_dev->flags & IFF_UP)
- return true;
-
- return false;
-}
-
-static void update_mac_addresses(struct batman_if *batman_if)
-{
- memcpy(((struct batman_packet *)(batman_if->packet_buff))->orig,
- batman_if->net_dev->dev_addr, ETH_ALEN);
- memcpy(((struct batman_packet *)(batman_if->packet_buff))->prev_sender,
- batman_if->net_dev->dev_addr, ETH_ALEN);
-}
-
-static void check_known_mac_addr(struct net_device *net_dev)
-{
- struct batman_if *batman_if;
-
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if ((batman_if->if_status != IF_ACTIVE) &&
- (batman_if->if_status != IF_TO_BE_ACTIVATED))
- continue;
-
- if (batman_if->net_dev == net_dev)
- continue;
-
- if (!compare_orig(batman_if->net_dev->dev_addr,
- net_dev->dev_addr))
- continue;
-
- pr_warning("The newly added mac address (%pM) already exists "
- "on: %s\n", net_dev->dev_addr,
- batman_if->net_dev->name);
- pr_warning("It is strongly recommended to keep mac addresses "
- "unique to avoid problems!\n");
- }
- rcu_read_unlock();
-}
-
-int hardif_min_mtu(struct net_device *soft_iface)
-{
- struct bat_priv *bat_priv = netdev_priv(soft_iface);
- struct batman_if *batman_if;
- /* allow big frames if all devices are capable to do so
- * (have MTU > 1500 + BAT_HEADER_LEN) */
- int min_mtu = ETH_DATA_LEN;
-
- if (atomic_read(&bat_priv->fragmentation))
- goto out;
-
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if ((batman_if->if_status != IF_ACTIVE) &&
- (batman_if->if_status != IF_TO_BE_ACTIVATED))
- continue;
-
- if (batman_if->soft_iface != soft_iface)
- continue;
-
- min_mtu = min_t(int, batman_if->net_dev->mtu - BAT_HEADER_LEN,
- min_mtu);
- }
- rcu_read_unlock();
-out:
- return min_mtu;
-}
-
-/* adjusts the MTU if a new interface with a smaller MTU appeared. */
-void update_min_mtu(struct net_device *soft_iface)
-{
- int min_mtu;
-
- min_mtu = hardif_min_mtu(soft_iface);
- if (soft_iface->mtu != min_mtu)
- soft_iface->mtu = min_mtu;
-}
-
-static void hardif_activate_interface(struct batman_if *batman_if)
-{
- struct bat_priv *bat_priv;
-
- if (batman_if->if_status != IF_INACTIVE)
- return;
-
- bat_priv = netdev_priv(batman_if->soft_iface);
-
- update_mac_addresses(batman_if);
- batman_if->if_status = IF_TO_BE_ACTIVATED;
-
- /**
- * the first active interface becomes our primary interface or
- * the next active interface after the old primay interface was removed
- */
- if (!bat_priv->primary_if)
- set_primary_if(bat_priv, batman_if);
-
- bat_info(batman_if->soft_iface, "Interface activated: %s\n",
- batman_if->net_dev->name);
-
- update_min_mtu(batman_if->soft_iface);
- return;
-}
-
-static void hardif_deactivate_interface(struct batman_if *batman_if)
-{
- if ((batman_if->if_status != IF_ACTIVE) &&
- (batman_if->if_status != IF_TO_BE_ACTIVATED))
- return;
-
- batman_if->if_status = IF_INACTIVE;
-
- bat_info(batman_if->soft_iface, "Interface deactivated: %s\n",
- batman_if->net_dev->name);
-
- update_min_mtu(batman_if->soft_iface);
-}
-
-int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
-{
- struct bat_priv *bat_priv;
- struct batman_packet *batman_packet;
-
- if (batman_if->if_status != IF_NOT_IN_USE)
- goto out;
-
- batman_if->soft_iface = dev_get_by_name(&init_net, iface_name);
-
- if (!batman_if->soft_iface) {
- batman_if->soft_iface = softif_create(iface_name);
-
- if (!batman_if->soft_iface)
- goto err;
-
- /* dev_get_by_name() increases the reference counter for us */
- dev_hold(batman_if->soft_iface);
- }
-
- bat_priv = netdev_priv(batman_if->soft_iface);
- batman_if->packet_len = BAT_PACKET_LEN;
- batman_if->packet_buff = kmalloc(batman_if->packet_len, GFP_ATOMIC);
-
- if (!batman_if->packet_buff) {
- bat_err(batman_if->soft_iface, "Can't add interface packet "
- "(%s): out of memory\n", batman_if->net_dev->name);
- goto err;
- }
-
- batman_packet = (struct batman_packet *)(batman_if->packet_buff);
- batman_packet->packet_type = BAT_PACKET;
- batman_packet->version = COMPAT_VERSION;
- batman_packet->flags = 0;
- batman_packet->ttl = 2;
- batman_packet->tq = TQ_MAX_VALUE;
- batman_packet->num_hna = 0;
-
- batman_if->if_num = bat_priv->num_ifaces;
- bat_priv->num_ifaces++;
- batman_if->if_status = IF_INACTIVE;
- orig_hash_add_if(batman_if, bat_priv->num_ifaces);
-
- batman_if->batman_adv_ptype.type = __constant_htons(ETH_P_BATMAN);
- batman_if->batman_adv_ptype.func = batman_skb_recv;
- batman_if->batman_adv_ptype.dev = batman_if->net_dev;
- kref_get(&batman_if->refcount);
- dev_add_pack(&batman_if->batman_adv_ptype);
-
- atomic_set(&batman_if->seqno, 1);
- atomic_set(&batman_if->frag_seqno, 1);
- bat_info(batman_if->soft_iface, "Adding interface: %s\n",
- batman_if->net_dev->name);
-
- if (atomic_read(&bat_priv->fragmentation) && batman_if->net_dev->mtu <
- ETH_DATA_LEN + BAT_HEADER_LEN)
- bat_info(batman_if->soft_iface,
- "The MTU of interface %s is too small (%i) to handle "
- "the transport of batman-adv packets. Packets going "
- "over this interface will be fragmented on layer2 "
- "which could impact the performance. Setting the MTU "
- "to %zi would solve the problem.\n",
- batman_if->net_dev->name, batman_if->net_dev->mtu,
- ETH_DATA_LEN + BAT_HEADER_LEN);
-
- if (!atomic_read(&bat_priv->fragmentation) && batman_if->net_dev->mtu <
- ETH_DATA_LEN + BAT_HEADER_LEN)
- bat_info(batman_if->soft_iface,
- "The MTU of interface %s is too small (%i) to handle "
- "the transport of batman-adv packets. If you experience"
- " problems getting traffic through try increasing the "
- "MTU to %zi.\n",
- batman_if->net_dev->name, batman_if->net_dev->mtu,
- ETH_DATA_LEN + BAT_HEADER_LEN);
-
- if (hardif_is_iface_up(batman_if))
- hardif_activate_interface(batman_if);
- else
- bat_err(batman_if->soft_iface, "Not using interface %s "
- "(retrying later): interface not active\n",
- batman_if->net_dev->name);
-
- /* begin scheduling originator messages on that interface */
- schedule_own_packet(batman_if);
-
-out:
- return 0;
-
-err:
- return -ENOMEM;
-}
-
-void hardif_disable_interface(struct batman_if *batman_if)
-{
- struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
-
- if (batman_if->if_status == IF_ACTIVE)
- hardif_deactivate_interface(batman_if);
-
- if (batman_if->if_status != IF_INACTIVE)
- return;
-
- bat_info(batman_if->soft_iface, "Removing interface: %s\n",
- batman_if->net_dev->name);
- dev_remove_pack(&batman_if->batman_adv_ptype);
- kref_put(&batman_if->refcount, hardif_free_ref);
-
- bat_priv->num_ifaces--;
- orig_hash_del_if(batman_if, bat_priv->num_ifaces);
-
- if (batman_if == bat_priv->primary_if) {
- struct batman_if *new_if;
-
- new_if = get_active_batman_if(batman_if->soft_iface);
- set_primary_if(bat_priv, new_if);
-
- if (new_if)
- kref_put(&new_if->refcount, hardif_free_ref);
- }
-
- kfree(batman_if->packet_buff);
- batman_if->packet_buff = NULL;
- batman_if->if_status = IF_NOT_IN_USE;
-
- /* delete all references to this batman_if */
- purge_orig_ref(bat_priv);
- purge_outstanding_packets(bat_priv, batman_if);
- dev_put(batman_if->soft_iface);
-
- /* nobody uses this interface anymore */
- if (!bat_priv->num_ifaces)
- softif_destroy(batman_if->soft_iface);
-
- batman_if->soft_iface = NULL;
-}
-
-static struct batman_if *hardif_add_interface(struct net_device *net_dev)
-{
- struct batman_if *batman_if;
- int ret;
-
- ret = is_valid_iface(net_dev);
- if (ret != 1)
- goto out;
-
- dev_hold(net_dev);
-
- batman_if = kmalloc(sizeof(struct batman_if), GFP_ATOMIC);
- if (!batman_if) {
- pr_err("Can't add interface (%s): out of memory\n",
- net_dev->name);
- goto release_dev;
- }
-
- ret = sysfs_add_hardif(&batman_if->hardif_obj, net_dev);
- if (ret)
- goto free_if;
-
- batman_if->if_num = -1;
- batman_if->net_dev = net_dev;
- batman_if->soft_iface = NULL;
- batman_if->if_status = IF_NOT_IN_USE;
- INIT_LIST_HEAD(&batman_if->list);
- kref_init(&batman_if->refcount);
-
- check_known_mac_addr(batman_if->net_dev);
-
- spin_lock(&if_list_lock);
- list_add_tail_rcu(&batman_if->list, &if_list);
- spin_unlock(&if_list_lock);
-
- /* extra reference for return */
- kref_get(&batman_if->refcount);
- return batman_if;
-
-free_if:
- kfree(batman_if);
-release_dev:
- dev_put(net_dev);
-out:
- return NULL;
-}
-
-static void hardif_remove_interface(struct batman_if *batman_if)
-{
- /* first deactivate interface */
- if (batman_if->if_status != IF_NOT_IN_USE)
- hardif_disable_interface(batman_if);
-
- if (batman_if->if_status != IF_NOT_IN_USE)
- return;
-
- batman_if->if_status = IF_TO_BE_REMOVED;
- sysfs_del_hardif(&batman_if->hardif_obj);
- call_rcu(&batman_if->rcu, hardif_free_rcu);
-}
-
-void hardif_remove_interfaces(void)
-{
- struct batman_if *batman_if, *batman_if_tmp;
- struct list_head if_list_queue;
-
- INIT_LIST_HEAD(&if_list_queue);
-
- spin_lock(&if_list_lock);
- list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list, list) {
- list_del_rcu(&batman_if->list);
- list_add_tail(&batman_if->list, &if_list_queue);
- }
- spin_unlock(&if_list_lock);
-
- rtnl_lock();
- list_for_each_entry_safe(batman_if, batman_if_tmp, &if_list_queue, list) {
- hardif_remove_interface(batman_if);
- }
- rtnl_unlock();
-}
-
-static int hard_if_event(struct notifier_block *this,
- unsigned long event, void *ptr)
-{
- struct net_device *net_dev = (struct net_device *)ptr;
- struct batman_if *batman_if = get_batman_if_by_netdev(net_dev);
- struct bat_priv *bat_priv;
-
- if (!batman_if && event == NETDEV_REGISTER)
- batman_if = hardif_add_interface(net_dev);
-
- if (!batman_if)
- goto out;
-
- switch (event) {
- case NETDEV_UP:
- hardif_activate_interface(batman_if);
- break;
- case NETDEV_GOING_DOWN:
- case NETDEV_DOWN:
- hardif_deactivate_interface(batman_if);
- break;
- case NETDEV_UNREGISTER:
- spin_lock(&if_list_lock);
- list_del_rcu(&batman_if->list);
- spin_unlock(&if_list_lock);
-
- hardif_remove_interface(batman_if);
- break;
- case NETDEV_CHANGEMTU:
- if (batman_if->soft_iface)
- update_min_mtu(batman_if->soft_iface);
- break;
- case NETDEV_CHANGEADDR:
- if (batman_if->if_status == IF_NOT_IN_USE)
- goto hardif_put;
-
- check_known_mac_addr(batman_if->net_dev);
- update_mac_addresses(batman_if);
-
- bat_priv = netdev_priv(batman_if->soft_iface);
- if (batman_if == bat_priv->primary_if)
- update_primary_addr(bat_priv);
- break;
- default:
- break;
- };
-
-hardif_put:
- kref_put(&batman_if->refcount, hardif_free_ref);
-out:
- return NOTIFY_DONE;
-}
-
-/* receive a packet with the batman ethertype coming on a hard
- * interface */
-int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *ptype, struct net_device *orig_dev)
-{
- struct bat_priv *bat_priv;
- struct batman_packet *batman_packet;
- struct batman_if *batman_if;
- int ret;
-
- batman_if = container_of(ptype, struct batman_if, batman_adv_ptype);
- skb = skb_share_check(skb, GFP_ATOMIC);
-
- /* skb was released by skb_share_check() */
- if (!skb)
- goto err_out;
-
- /* packet should hold at least type and version */
- if (unlikely(!pskb_may_pull(skb, 2)))
- goto err_free;
-
- /* expect a valid ethernet header here. */
- if (unlikely(skb->mac_len != sizeof(struct ethhdr)
- || !skb_mac_header(skb)))
- goto err_free;
-
- if (!batman_if->soft_iface)
- goto err_free;
-
- bat_priv = netdev_priv(batman_if->soft_iface);
-
- if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
- goto err_free;
-
- /* discard frames on not active interfaces */
- if (batman_if->if_status != IF_ACTIVE)
- goto err_free;
-
- batman_packet = (struct batman_packet *)skb->data;
-
- if (batman_packet->version != COMPAT_VERSION) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: incompatible batman version (%i)\n",
- batman_packet->version);
- goto err_free;
- }
-
- /* all receive handlers return whether they received or reused
- * the supplied skb. if not, we have to free the skb. */
-
- switch (batman_packet->packet_type) {
- /* batman originator packet */
- case BAT_PACKET:
- ret = recv_bat_packet(skb, batman_if);
- break;
-
- /* batman icmp packet */
- case BAT_ICMP:
- ret = recv_icmp_packet(skb, batman_if);
- break;
-
- /* unicast packet */
- case BAT_UNICAST:
- ret = recv_unicast_packet(skb, batman_if);
- break;
-
- /* fragmented unicast packet */
- case BAT_UNICAST_FRAG:
- ret = recv_ucast_frag_packet(skb, batman_if);
- break;
-
- /* broadcast packet */
- case BAT_BCAST:
- ret = recv_bcast_packet(skb, batman_if);
- break;
-
- /* vis packet */
- case BAT_VIS:
- ret = recv_vis_packet(skb, batman_if);
- break;
- default:
- ret = NET_RX_DROP;
- }
-
- if (ret == NET_RX_DROP)
- kfree_skb(skb);
-
- /* return NET_RX_SUCCESS in any case as we
- * most probably dropped the packet for
- * routing-logical reasons. */
-
- return NET_RX_SUCCESS;
-
-err_free:
- kfree_skb(skb);
-err_out:
- return NET_RX_DROP;
-}
-
-struct notifier_block hard_if_notifier = {
- .notifier_call = hard_if_event,
-};
diff --git a/drivers/staging/batman-adv/hard-interface.h b/drivers/staging/batman-adv/hard-interface.h
deleted file mode 100644
index 30ec3b8..0000000
--- a/drivers/staging/batman-adv/hard-interface.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_
-#define _NET_BATMAN_ADV_HARD_INTERFACE_H_
-
-#define IF_NOT_IN_USE 0
-#define IF_TO_BE_REMOVED 1
-#define IF_INACTIVE 2
-#define IF_ACTIVE 3
-#define IF_TO_BE_ACTIVATED 4
-#define IF_I_WANT_YOU 5
-
-extern struct notifier_block hard_if_notifier;
-
-struct batman_if *get_batman_if_by_netdev(struct net_device *net_dev);
-int hardif_enable_interface(struct batman_if *batman_if, char *iface_name);
-void hardif_disable_interface(struct batman_if *batman_if);
-void hardif_remove_interfaces(void);
-int batman_skb_recv(struct sk_buff *skb,
- struct net_device *dev,
- struct packet_type *ptype,
- struct net_device *orig_dev);
-int hardif_min_mtu(struct net_device *soft_iface);
-void update_min_mtu(struct net_device *soft_iface);
-
-static inline void hardif_free_ref(struct kref *refcount)
-{
- struct batman_if *batman_if;
-
- batman_if = container_of(refcount, struct batman_if, refcount);
- kfree(batman_if);
-}
-
-#endif /* _NET_BATMAN_ADV_HARD_INTERFACE_H_ */
diff --git a/drivers/staging/batman-adv/hash.c b/drivers/staging/batman-adv/hash.c
deleted file mode 100644
index 8605e2f..0000000
--- a/drivers/staging/batman-adv/hash.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "hash.h"
-
-/* clears the hash */
-static void hash_init(struct hashtable_t *hash)
-{
- int i;
-
- hash->elements = 0;
-
- for (i = 0 ; i < hash->size; i++)
- INIT_HLIST_HEAD(&hash->table[i]);
-}
-
-/* free only the hashtable and the hash itself. */
-void hash_destroy(struct hashtable_t *hash)
-{
- kfree(hash->table);
- kfree(hash);
-}
-
-/* allocates and clears the hash */
-struct hashtable_t *hash_new(int size)
-{
- struct hashtable_t *hash;
-
- hash = kmalloc(sizeof(struct hashtable_t) , GFP_ATOMIC);
-
- if (hash == NULL)
- return NULL;
-
- hash->size = size;
- hash->table = kmalloc(sizeof(struct element_t *) * size, GFP_ATOMIC);
-
- if (hash->table == NULL) {
- kfree(hash);
- return NULL;
- }
-
- hash_init(hash);
-
- return hash;
-}
-
-/* remove bucket (this might be used in hash_iterate() if you already found the
- * bucket you want to delete and don't need the overhead to find it again with
- * hash_remove(). But usually, you don't want to use this function, as it
- * fiddles with hash-internals. */
-void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t)
-{
- void *data_save;
- struct element_t *bucket;
-
- bucket = hlist_entry(hash_it_t->walk, struct element_t, hlist);
- data_save = bucket->data;
-
- hlist_del(hash_it_t->walk);
- kfree(bucket);
- hash->elements--;
-
- return data_save;
-}
diff --git a/drivers/staging/batman-adv/hash.h b/drivers/staging/batman-adv/hash.h
deleted file mode 100644
index 0b61c6e..0000000
--- a/drivers/staging/batman-adv/hash.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_HASH_H_
-#define _NET_BATMAN_ADV_HASH_H_
-
-#include <linux/list.h>
-
-#define HASHIT(name) struct hash_it_t name = { \
- .index = 0, .walk = NULL, \
- .safe = NULL}
-
-/* callback to a compare function. should
- * compare 2 element datas for their keys,
- * return 0 if same and not 0 if not
- * same */
-typedef int (*hashdata_compare_cb)(void *, void *);
-
-/* the hashfunction, should return an index
- * based on the key in the data of the first
- * argument and the size the second */
-typedef int (*hashdata_choose_cb)(void *, int);
-typedef void (*hashdata_free_cb)(void *, void *);
-
-struct element_t {
- void *data; /* pointer to the data */
- struct hlist_node hlist; /* bucket list pointer */
-};
-
-struct hash_it_t {
- size_t index;
- struct hlist_node *walk;
- struct hlist_node *safe;
-};
-
-struct hashtable_t {
- struct hlist_head *table; /* the hashtable itself, with the buckets */
- int elements; /* number of elements registered */
- int size; /* size of hashtable */
-};
-
-/* allocates and clears the hash */
-struct hashtable_t *hash_new(int size);
-
-/* remove bucket (this might be used in hash_iterate() if you already found the
- * bucket you want to delete and don't need the overhead to find it again with
- * hash_remove(). But usually, you don't want to use this function, as it
- * fiddles with hash-internals. */
-void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t);
-
-/* free only the hashtable and the hash itself. */
-void hash_destroy(struct hashtable_t *hash);
-
-/* remove the hash structure. if hashdata_free_cb != NULL, this function will be
- * called to remove the elements inside of the hash. if you don't remove the
- * elements, memory might be leaked. */
-static inline void hash_delete(struct hashtable_t *hash,
- hashdata_free_cb free_cb, void *arg)
-{
- struct hlist_head *head;
- struct hlist_node *walk, *safe;
- struct element_t *bucket;
- int i;
-
- for (i = 0; i < hash->size; i++) {
- head = &hash->table[i];
-
- hlist_for_each_safe(walk, safe, head) {
- bucket = hlist_entry(walk, struct element_t, hlist);
- if (free_cb != NULL)
- free_cb(bucket->data, arg);
-
- hlist_del(walk);
- kfree(bucket);
- }
- }
-
- hash_destroy(hash);
-}
-
-/* adds data to the hashtable. returns 0 on success, -1 on error */
-static inline int hash_add(struct hashtable_t *hash,
- hashdata_compare_cb compare,
- hashdata_choose_cb choose, void *data)
-{
- int index;
- struct hlist_head *head;
- struct hlist_node *walk, *safe;
- struct element_t *bucket;
-
- if (!hash)
- return -1;
-
- index = choose(data, hash->size);
- head = &hash->table[index];
-
- hlist_for_each_safe(walk, safe, head) {
- bucket = hlist_entry(walk, struct element_t, hlist);
- if (compare(bucket->data, data))
- return -1;
- }
-
- /* no duplicate found in list, add new element */
- bucket = kmalloc(sizeof(struct element_t), GFP_ATOMIC);
-
- if (bucket == NULL)
- return -1;
-
- bucket->data = data;
- hlist_add_head(&bucket->hlist, head);
-
- hash->elements++;
- return 0;
-}
-
-/* removes data from hash, if found. returns pointer do data on success, so you
- * can remove the used structure yourself, or NULL on error . data could be the
- * structure you use with just the key filled, we just need the key for
- * comparing. */
-static inline void *hash_remove(struct hashtable_t *hash,
- hashdata_compare_cb compare,
- hashdata_choose_cb choose, void *data)
-{
- struct hash_it_t hash_it_t;
- struct element_t *bucket;
- struct hlist_head *head;
-
- hash_it_t.index = choose(data, hash->size);
- head = &hash->table[hash_it_t.index];
-
- hlist_for_each(hash_it_t.walk, head) {
- bucket = hlist_entry(hash_it_t.walk, struct element_t, hlist);
- if (compare(bucket->data, data))
- return hash_remove_bucket(hash, &hash_it_t);
- }
-
- return NULL;
-}
-
-/* finds data, based on the key in keydata. returns the found data on success,
- * or NULL on error */
-static inline void *hash_find(struct hashtable_t *hash,
- hashdata_compare_cb compare,
- hashdata_choose_cb choose, void *keydata)
-{
- int index;
- struct hlist_head *head;
- struct hlist_node *walk;
- struct element_t *bucket;
-
- if (!hash)
- return NULL;
-
- index = choose(keydata , hash->size);
- head = &hash->table[index];
-
- hlist_for_each(walk, head) {
- bucket = hlist_entry(walk, struct element_t, hlist);
- if (compare(bucket->data, keydata))
- return bucket->data;
- }
-
- return NULL;
-}
-
-/* resize the hash, returns the pointer to the new hash or NULL on
- * error. removes the old hash on success */
-static inline struct hashtable_t *hash_resize(struct hashtable_t *hash,
- hashdata_choose_cb choose,
- int size)
-{
- struct hashtable_t *new_hash;
- struct hlist_head *head, *new_head;
- struct hlist_node *walk, *safe;
- struct element_t *bucket;
- int i, new_index;
-
- /* initialize a new hash with the new size */
- new_hash = hash_new(size);
-
- if (new_hash == NULL)
- return NULL;
-
- /* copy the elements */
- for (i = 0; i < hash->size; i++) {
- head = &hash->table[i];
-
- hlist_for_each_safe(walk, safe, head) {
- bucket = hlist_entry(walk, struct element_t, hlist);
-
- new_index = choose(bucket->data, size);
- new_head = &new_hash->table[new_index];
-
- hlist_del(walk);
- hlist_add_head(walk, new_head);
- }
- }
-
- hash_destroy(hash);
-
- return new_hash;
-}
-
-/* iterate though the hash. First element is selected if an iterator
- * initialized with HASHIT() is supplied as iter. Use the returned
- * (or supplied) iterator to access the elements until hash_iterate returns
- * NULL. */
-static inline struct hash_it_t *hash_iterate(struct hashtable_t *hash,
- struct hash_it_t *iter)
-{
- if (!hash)
- return NULL;
- if (!iter)
- return NULL;
-
- iter->walk = iter->safe;
-
- /* we search for the next head with list entries */
- if (!iter->walk) {
- while (iter->index < hash->size) {
- if (hlist_empty(&hash->table[iter->index]))
- iter->index++;
- else {
- iter->walk = hash->table[iter->index].first;
-
- /* search next time */
- ++iter->index;
- break;
- }
- }
- }
-
- /* return iter when we found bucket otherwise null */
- if (!iter->walk)
- return NULL;
-
- iter->safe = iter->walk->next;
- return iter;
-}
-
-#endif /* _NET_BATMAN_ADV_HASH_H_ */
diff --git a/drivers/staging/batman-adv/icmp_socket.c b/drivers/staging/batman-adv/icmp_socket.c
deleted file mode 100644
index ecf6d7f..0000000
--- a/drivers/staging/batman-adv/icmp_socket.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include <linux/debugfs.h>
-#include <linux/slab.h>
-#include "icmp_socket.h"
-#include "send.h"
-#include "types.h"
-#include "hash.h"
-#include "originator.h"
-#include "hard-interface.h"
-
-static struct socket_client *socket_client_hash[256];
-
-static void bat_socket_add_packet(struct socket_client *socket_client,
- struct icmp_packet_rr *icmp_packet,
- size_t icmp_len);
-
-void bat_socket_init(void)
-{
- memset(socket_client_hash, 0, sizeof(socket_client_hash));
-}
-
-static int bat_socket_open(struct inode *inode, struct file *file)
-{
- unsigned int i;
- struct socket_client *socket_client;
-
- nonseekable_open(inode, file);
-
- socket_client = kmalloc(sizeof(struct socket_client), GFP_KERNEL);
-
- if (!socket_client)
- return -ENOMEM;
-
- for (i = 0; i < ARRAY_SIZE(socket_client_hash); i++) {
- if (!socket_client_hash[i]) {
- socket_client_hash[i] = socket_client;
- break;
- }
- }
-
- if (i == ARRAY_SIZE(socket_client_hash)) {
- pr_err("Error - can't add another packet client: "
- "maximum number of clients reached\n");
- kfree(socket_client);
- return -EXFULL;
- }
-
- INIT_LIST_HEAD(&socket_client->queue_list);
- socket_client->queue_len = 0;
- socket_client->index = i;
- socket_client->bat_priv = inode->i_private;
- spin_lock_init(&socket_client->lock);
- init_waitqueue_head(&socket_client->queue_wait);
-
- file->private_data = socket_client;
-
- inc_module_count();
- return 0;
-}
-
-static int bat_socket_release(struct inode *inode, struct file *file)
-{
- struct socket_client *socket_client = file->private_data;
- struct socket_packet *socket_packet;
- struct list_head *list_pos, *list_pos_tmp;
-
- spin_lock_bh(&socket_client->lock);
-
- /* for all packets in the queue ... */
- list_for_each_safe(list_pos, list_pos_tmp, &socket_client->queue_list) {
- socket_packet = list_entry(list_pos,
- struct socket_packet, list);
-
- list_del(list_pos);
- kfree(socket_packet);
- }
-
- socket_client_hash[socket_client->index] = NULL;
- spin_unlock_bh(&socket_client->lock);
-
- kfree(socket_client);
- dec_module_count();
-
- return 0;
-}
-
-static ssize_t bat_socket_read(struct file *file, char __user *buf,
- size_t count, loff_t *ppos)
-{
- struct socket_client *socket_client = file->private_data;
- struct socket_packet *socket_packet;
- size_t packet_len;
- int error;
-
- if ((file->f_flags & O_NONBLOCK) && (socket_client->queue_len == 0))
- return -EAGAIN;
-
- if ((!buf) || (count < sizeof(struct icmp_packet)))
- return -EINVAL;
-
- if (!access_ok(VERIFY_WRITE, buf, count))
- return -EFAULT;
-
- error = wait_event_interruptible(socket_client->queue_wait,
- socket_client->queue_len);
-
- if (error)
- return error;
-
- spin_lock_bh(&socket_client->lock);
-
- socket_packet = list_first_entry(&socket_client->queue_list,
- struct socket_packet, list);
- list_del(&socket_packet->list);
- socket_client->queue_len--;
-
- spin_unlock_bh(&socket_client->lock);
-
- error = __copy_to_user(buf, &socket_packet->icmp_packet,
- socket_packet->icmp_len);
-
- packet_len = socket_packet->icmp_len;
- kfree(socket_packet);
-
- if (error)
- return -EFAULT;
-
- return packet_len;
-}
-
-static ssize_t bat_socket_write(struct file *file, const char __user *buff,
- size_t len, loff_t *off)
-{
- struct socket_client *socket_client = file->private_data;
- struct bat_priv *bat_priv = socket_client->bat_priv;
- struct sk_buff *skb;
- struct icmp_packet_rr *icmp_packet;
-
- struct orig_node *orig_node;
- struct batman_if *batman_if;
- size_t packet_len = sizeof(struct icmp_packet);
- uint8_t dstaddr[ETH_ALEN];
-
- if (len < sizeof(struct icmp_packet)) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Error - can't send packet from char device: "
- "invalid packet size\n");
- return -EINVAL;
- }
-
- if (!bat_priv->primary_if)
- return -EFAULT;
-
- if (len >= sizeof(struct icmp_packet_rr))
- packet_len = sizeof(struct icmp_packet_rr);
-
- skb = dev_alloc_skb(packet_len + sizeof(struct ethhdr));
- if (!skb)
- return -ENOMEM;
-
- skb_reserve(skb, sizeof(struct ethhdr));
- icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len);
-
- if (!access_ok(VERIFY_READ, buff, packet_len)) {
- len = -EFAULT;
- goto free_skb;
- }
-
- if (__copy_from_user(icmp_packet, buff, packet_len)) {
- len = -EFAULT;
- goto free_skb;
- }
-
- if (icmp_packet->packet_type != BAT_ICMP) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Error - can't send packet from char device: "
- "got bogus packet type (expected: BAT_ICMP)\n");
- len = -EINVAL;
- goto free_skb;
- }
-
- if (icmp_packet->msg_type != ECHO_REQUEST) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Error - can't send packet from char device: "
- "got bogus message type (expected: ECHO_REQUEST)\n");
- len = -EINVAL;
- goto free_skb;
- }
-
- icmp_packet->uid = socket_client->index;
-
- if (icmp_packet->version != COMPAT_VERSION) {
- icmp_packet->msg_type = PARAMETER_PROBLEM;
- icmp_packet->ttl = COMPAT_VERSION;
- bat_socket_add_packet(socket_client, icmp_packet, packet_len);
- goto free_skb;
- }
-
- if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
- goto dst_unreach;
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
- compare_orig, choose_orig,
- icmp_packet->dst));
-
- if (!orig_node)
- goto unlock;
-
- if (!orig_node->router)
- goto unlock;
-
- batman_if = orig_node->router->if_incoming;
- memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- if (!batman_if)
- goto dst_unreach;
-
- if (batman_if->if_status != IF_ACTIVE)
- goto dst_unreach;
-
- memcpy(icmp_packet->orig,
- bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-
- if (packet_len == sizeof(struct icmp_packet_rr))
- memcpy(icmp_packet->rr, batman_if->net_dev->dev_addr, ETH_ALEN);
-
-
- send_skb_packet(skb, batman_if, dstaddr);
-
- goto out;
-
-unlock:
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-dst_unreach:
- icmp_packet->msg_type = DESTINATION_UNREACHABLE;
- bat_socket_add_packet(socket_client, icmp_packet, packet_len);
-free_skb:
- kfree_skb(skb);
-out:
- return len;
-}
-
-static unsigned int bat_socket_poll(struct file *file, poll_table *wait)
-{
- struct socket_client *socket_client = file->private_data;
-
- poll_wait(file, &socket_client->queue_wait, wait);
-
- if (socket_client->queue_len > 0)
- return POLLIN | POLLRDNORM;
-
- return 0;
-}
-
-static const struct file_operations fops = {
- .owner = THIS_MODULE,
- .open = bat_socket_open,
- .release = bat_socket_release,
- .read = bat_socket_read,
- .write = bat_socket_write,
- .poll = bat_socket_poll,
- .llseek = no_llseek,
-};
-
-int bat_socket_setup(struct bat_priv *bat_priv)
-{
- struct dentry *d;
-
- if (!bat_priv->debug_dir)
- goto err;
-
- d = debugfs_create_file(ICMP_SOCKET, S_IFREG | S_IWUSR | S_IRUSR,
- bat_priv->debug_dir, bat_priv, &fops);
- if (d)
- goto err;
-
- return 0;
-
-err:
- return 1;
-}
-
-static void bat_socket_add_packet(struct socket_client *socket_client,
- struct icmp_packet_rr *icmp_packet,
- size_t icmp_len)
-{
- struct socket_packet *socket_packet;
-
- socket_packet = kmalloc(sizeof(struct socket_packet), GFP_ATOMIC);
-
- if (!socket_packet)
- return;
-
- INIT_LIST_HEAD(&socket_packet->list);
- memcpy(&socket_packet->icmp_packet, icmp_packet, icmp_len);
- socket_packet->icmp_len = icmp_len;
-
- spin_lock_bh(&socket_client->lock);
-
- /* while waiting for the lock the socket_client could have been
- * deleted */
- if (!socket_client_hash[icmp_packet->uid]) {
- spin_unlock_bh(&socket_client->lock);
- kfree(socket_packet);
- return;
- }
-
- list_add_tail(&socket_packet->list, &socket_client->queue_list);
- socket_client->queue_len++;
-
- if (socket_client->queue_len > 100) {
- socket_packet = list_first_entry(&socket_client->queue_list,
- struct socket_packet, list);
-
- list_del(&socket_packet->list);
- kfree(socket_packet);
- socket_client->queue_len--;
- }
-
- spin_unlock_bh(&socket_client->lock);
-
- wake_up(&socket_client->queue_wait);
-}
-
-void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
- size_t icmp_len)
-{
- struct socket_client *hash = socket_client_hash[icmp_packet->uid];
-
- if (hash)
- bat_socket_add_packet(hash, icmp_packet, icmp_len);
-}
diff --git a/drivers/staging/batman-adv/icmp_socket.h b/drivers/staging/batman-adv/icmp_socket.h
deleted file mode 100644
index bf9b348..0000000
--- a/drivers/staging/batman-adv/icmp_socket.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_
-#define _NET_BATMAN_ADV_ICMP_SOCKET_H_
-
-#include "types.h"
-
-#define ICMP_SOCKET "socket"
-
-void bat_socket_init(void);
-int bat_socket_setup(struct bat_priv *bat_priv);
-void bat_socket_receive_packet(struct icmp_packet_rr *icmp_packet,
- size_t icmp_len);
-
-#endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */
diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c
deleted file mode 100644
index b827f6a..0000000
--- a/drivers/staging/batman-adv/main.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "bat_sysfs.h"
-#include "bat_debugfs.h"
-#include "routing.h"
-#include "send.h"
-#include "originator.h"
-#include "soft-interface.h"
-#include "icmp_socket.h"
-#include "translation-table.h"
-#include "hard-interface.h"
-#include "gateway_client.h"
-#include "types.h"
-#include "vis.h"
-#include "hash.h"
-
-struct list_head if_list;
-
-unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
-struct workqueue_struct *bat_event_workqueue;
-
-static int __init batman_init(void)
-{
- INIT_LIST_HEAD(&if_list);
-
- /* the name should not be longer than 10 chars - see
- * http://lwn.net/Articles/23634/ */
- bat_event_workqueue = create_singlethread_workqueue("bat_events");
-
- if (!bat_event_workqueue)
- return -ENOMEM;
-
- bat_socket_init();
- debugfs_init();
-
- register_netdevice_notifier(&hard_if_notifier);
-
- pr_info("B.A.T.M.A.N. advanced %s%s (compatibility version %i) "
- "loaded\n", SOURCE_VERSION, REVISION_VERSION_STR,
- COMPAT_VERSION);
-
- return 0;
-}
-
-static void __exit batman_exit(void)
-{
- debugfs_destroy();
- unregister_netdevice_notifier(&hard_if_notifier);
- hardif_remove_interfaces();
-
- flush_workqueue(bat_event_workqueue);
- destroy_workqueue(bat_event_workqueue);
- bat_event_workqueue = NULL;
-
- rcu_barrier();
-}
-
-int mesh_init(struct net_device *soft_iface)
-{
- struct bat_priv *bat_priv = netdev_priv(soft_iface);
-
- spin_lock_init(&bat_priv->orig_hash_lock);
- spin_lock_init(&bat_priv->forw_bat_list_lock);
- spin_lock_init(&bat_priv->forw_bcast_list_lock);
- spin_lock_init(&bat_priv->hna_lhash_lock);
- spin_lock_init(&bat_priv->hna_ghash_lock);
- spin_lock_init(&bat_priv->gw_list_lock);
- spin_lock_init(&bat_priv->vis_hash_lock);
- spin_lock_init(&bat_priv->vis_list_lock);
- spin_lock_init(&bat_priv->softif_neigh_lock);
-
- INIT_HLIST_HEAD(&bat_priv->forw_bat_list);
- INIT_HLIST_HEAD(&bat_priv->forw_bcast_list);
- INIT_HLIST_HEAD(&bat_priv->gw_list);
- INIT_HLIST_HEAD(&bat_priv->softif_neigh_list);
-
- if (originator_init(bat_priv) < 1)
- goto err;
-
- if (hna_local_init(bat_priv) < 1)
- goto err;
-
- if (hna_global_init(bat_priv) < 1)
- goto err;
-
- hna_local_add(soft_iface, soft_iface->dev_addr);
-
- if (vis_init(bat_priv) < 1)
- goto err;
-
- atomic_set(&bat_priv->mesh_state, MESH_ACTIVE);
- goto end;
-
-err:
- pr_err("Unable to allocate memory for mesh information structures: "
- "out of mem ?\n");
- mesh_free(soft_iface);
- return -1;
-
-end:
- return 0;
-}
-
-void mesh_free(struct net_device *soft_iface)
-{
- struct bat_priv *bat_priv = netdev_priv(soft_iface);
-
- atomic_set(&bat_priv->mesh_state, MESH_DEACTIVATING);
-
- purge_outstanding_packets(bat_priv, NULL);
-
- vis_quit(bat_priv);
-
- gw_node_purge(bat_priv);
- originator_free(bat_priv);
-
- hna_local_free(bat_priv);
- hna_global_free(bat_priv);
-
- softif_neigh_purge(bat_priv);
-
- atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
-}
-
-void inc_module_count(void)
-{
- try_module_get(THIS_MODULE);
-}
-
-void dec_module_count(void)
-{
- module_put(THIS_MODULE);
-}
-
-int is_my_mac(uint8_t *addr)
-{
- struct batman_if *batman_if;
-
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if (batman_if->if_status != IF_ACTIVE)
- continue;
-
- if (compare_orig(batman_if->net_dev->dev_addr, addr)) {
- rcu_read_unlock();
- return 1;
- }
- }
- rcu_read_unlock();
- return 0;
-
-}
-
-module_init(batman_init);
-module_exit(batman_exit);
-
-MODULE_LICENSE("GPL");
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE);
-#ifdef REVISION_VERSION
-MODULE_VERSION(SOURCE_VERSION "-" REVISION_VERSION);
-#else
-MODULE_VERSION(SOURCE_VERSION);
-#endif
diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h
deleted file mode 100644
index d4d9926..0000000
--- a/drivers/staging/batman-adv/main.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_MAIN_H_
-#define _NET_BATMAN_ADV_MAIN_H_
-
-/* Kernel Programming */
-#define LINUX
-
-#define DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \
- "Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>"
-#define DRIVER_DESC "B.A.T.M.A.N. advanced"
-#define DRIVER_DEVICE "batman-adv"
-
-#define SOURCE_VERSION "next"
-
-
-/* B.A.T.M.A.N. parameters */
-
-#define TQ_MAX_VALUE 255
-#define JITTER 20
-#define TTL 50 /* Time To Live of broadcast messages */
-
-#define PURGE_TIMEOUT 200 /* purge originators after time in seconds if no
- * valid packet comes in -> TODO: check
- * influence on TQ_LOCAL_WINDOW_SIZE */
-#define LOCAL_HNA_TIMEOUT 3600 /* in seconds */
-
-#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator
- * messages in squence numbers (should be a
- * multiple of our word size) */
-#define TQ_GLOBAL_WINDOW_SIZE 5
-#define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
-#define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1
-#define TQ_TOTAL_BIDRECT_LIMIT 1
-
-#define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE)
-
-#define PACKBUFF_SIZE 2000
-#define LOG_BUF_LEN 8192 /* has to be a power of 2 */
-
-#define VIS_INTERVAL 5000 /* 5 seconds */
-
-/* how much worse secondary interfaces may be to
- * to be considered as bonding candidates */
-
-#define BONDING_TQ_THRESHOLD 50
-
-#define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or
- * change the size of
- * forw_packet->direct_link_flags */
-#define MAX_AGGREGATION_MS 100
-
-#define SOFTIF_NEIGH_TIMEOUT 180000 /* 3 minutes */
-
-#define RESET_PROTECTION_MS 30000
-#define EXPECTED_SEQNO_RANGE 65536
-/* don't reset again within 30 seconds */
-
-#define MESH_INACTIVE 0
-#define MESH_ACTIVE 1
-#define MESH_DEACTIVATING 2
-
-#define BCAST_QUEUE_LEN 256
-#define BATMAN_QUEUE_LEN 256
-
-/*
- * Debug Messages
- */
-#ifdef pr_fmt
-#undef pr_fmt
-#endif
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* Append 'batman-adv: ' before
- * kernel messages */
-
-#define DBG_BATMAN 1 /* all messages related to routing / flooding /
- * broadcasting / etc */
-#define DBG_ROUTES 2 /* route or hna added / changed / deleted */
-#define DBG_ALL 3
-
-#define LOG_BUF_LEN 8192 /* has to be a power of 2 */
-
-
-/*
- * Vis
- */
-
-/* #define VIS_SUBCLUSTERS_DISABLED */
-
-/*
- * Kernel headers
- */
-
-#include <linux/mutex.h> /* mutex */
-#include <linux/module.h> /* needed by all modules */
-#include <linux/netdevice.h> /* netdevice */
-#include <linux/etherdevice.h> /* ethernet address classifaction */
-#include <linux/if_ether.h> /* ethernet header */
-#include <linux/poll.h> /* poll_table */
-#include <linux/kthread.h> /* kernel threads */
-#include <linux/pkt_sched.h> /* schedule types */
-#include <linux/workqueue.h> /* workqueue */
-#include <linux/slab.h>
-#include <net/sock.h> /* struct sock */
-#include <linux/jiffies.h>
-#include <linux/seq_file.h>
-#include "types.h"
-
-#ifndef REVISION_VERSION
-#define REVISION_VERSION_STR ""
-#else
-#define REVISION_VERSION_STR " "REVISION_VERSION
-#endif
-
-extern struct list_head if_list;
-
-extern unsigned char broadcast_addr[];
-extern struct workqueue_struct *bat_event_workqueue;
-
-int mesh_init(struct net_device *soft_iface);
-void mesh_free(struct net_device *soft_iface);
-void inc_module_count(void);
-void dec_module_count(void);
-int is_my_mac(uint8_t *addr);
-
-#ifdef CONFIG_BATMAN_ADV_DEBUG
-int debug_log(struct bat_priv *bat_priv, char *fmt, ...);
-
-#define bat_dbg(type, bat_priv, fmt, arg...) \
- do { \
- if (atomic_read(&bat_priv->log_level) & type) \
- debug_log(bat_priv, fmt, ## arg); \
- } \
- while (0)
-#else /* !CONFIG_BATMAN_ADV_DEBUG */
-static inline void bat_dbg(char type __attribute__((unused)),
- struct bat_priv *bat_priv __attribute__((unused)),
- char *fmt __attribute__((unused)), ...)
-{
-}
-#endif
-
-#define bat_warning(net_dev, fmt, arg...) \
- do { \
- struct net_device *_netdev = (net_dev); \
- struct bat_priv *_batpriv = netdev_priv(_netdev); \
- bat_dbg(DBG_ALL, _batpriv, fmt, ## arg); \
- pr_warning("%s: " fmt, _netdev->name, ## arg); \
- } while (0)
-#define bat_info(net_dev, fmt, arg...) \
- do { \
- struct net_device *_netdev = (net_dev); \
- struct bat_priv *_batpriv = netdev_priv(_netdev); \
- bat_dbg(DBG_ALL, _batpriv, fmt, ## arg); \
- pr_info("%s: " fmt, _netdev->name, ## arg); \
- } while (0)
-#define bat_err(net_dev, fmt, arg...) \
- do { \
- struct net_device *_netdev = (net_dev); \
- struct bat_priv *_batpriv = netdev_priv(_netdev); \
- bat_dbg(DBG_ALL, _batpriv, fmt, ## arg); \
- pr_err("%s: " fmt, _netdev->name, ## arg); \
- } while (0)
-
-#endif /* _NET_BATMAN_ADV_MAIN_H_ */
diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c
deleted file mode 100644
index 89ec021..0000000
--- a/drivers/staging/batman-adv/originator.c
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-/* increase the reference counter for this originator */
-
-#include "main.h"
-#include "originator.h"
-#include "hash.h"
-#include "translation-table.h"
-#include "routing.h"
-#include "gateway_client.h"
-#include "hard-interface.h"
-#include "unicast.h"
-#include "soft-interface.h"
-
-static void purge_orig(struct work_struct *work);
-
-static void start_purge_timer(struct bat_priv *bat_priv)
-{
- INIT_DELAYED_WORK(&bat_priv->orig_work, purge_orig);
- queue_delayed_work(bat_event_workqueue, &bat_priv->orig_work, 1 * HZ);
-}
-
-int originator_init(struct bat_priv *bat_priv)
-{
- if (bat_priv->orig_hash)
- return 1;
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- bat_priv->orig_hash = hash_new(128);
-
- if (!bat_priv->orig_hash)
- goto err;
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- start_purge_timer(bat_priv);
- return 1;
-
-err:
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return 0;
-}
-
-struct neigh_node *
-create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node,
- uint8_t *neigh, struct batman_if *if_incoming)
-{
- struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- struct neigh_node *neigh_node;
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Creating new last-hop neighbor of originator\n");
-
- neigh_node = kzalloc(sizeof(struct neigh_node), GFP_ATOMIC);
- if (!neigh_node)
- return NULL;
-
- INIT_LIST_HEAD(&neigh_node->list);
-
- memcpy(neigh_node->addr, neigh, ETH_ALEN);
- neigh_node->orig_node = orig_neigh_node;
- neigh_node->if_incoming = if_incoming;
-
- list_add_tail(&neigh_node->list, &orig_node->neigh_list);
- return neigh_node;
-}
-
-static void free_orig_node(void *data, void *arg)
-{
- struct list_head *list_pos, *list_pos_tmp;
- struct neigh_node *neigh_node;
- struct orig_node *orig_node = (struct orig_node *)data;
- struct bat_priv *bat_priv = (struct bat_priv *)arg;
-
- /* for all neighbors towards this originator ... */
- list_for_each_safe(list_pos, list_pos_tmp, &orig_node->neigh_list) {
- neigh_node = list_entry(list_pos, struct neigh_node, list);
-
- list_del(list_pos);
- kfree(neigh_node);
- }
-
- frag_list_free(&orig_node->frag_list);
- hna_global_del_orig(bat_priv, orig_node, "originator timed out");
-
- kfree(orig_node->bcast_own);
- kfree(orig_node->bcast_own_sum);
- kfree(orig_node);
-}
-
-void originator_free(struct bat_priv *bat_priv)
-{
- if (!bat_priv->orig_hash)
- return;
-
- cancel_delayed_work_sync(&bat_priv->orig_work);
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- hash_delete(bat_priv->orig_hash, free_orig_node, bat_priv);
- bat_priv->orig_hash = NULL;
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-}
-
-/* this function finds or creates an originator entry for the given
- * address if it does not exits */
-struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr)
-{
- struct orig_node *orig_node;
- struct hashtable_t *swaphash;
- int size;
- int hash_added;
-
- orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
- compare_orig, choose_orig,
- addr));
-
- if (orig_node)
- return orig_node;
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Creating new originator: %pM\n", addr);
-
- orig_node = kzalloc(sizeof(struct orig_node), GFP_ATOMIC);
- if (!orig_node)
- return NULL;
-
- INIT_LIST_HEAD(&orig_node->neigh_list);
-
- memcpy(orig_node->orig, addr, ETH_ALEN);
- orig_node->router = NULL;
- orig_node->hna_buff = NULL;
- orig_node->bcast_seqno_reset = jiffies - 1
- - msecs_to_jiffies(RESET_PROTECTION_MS);
- orig_node->batman_seqno_reset = jiffies - 1
- - msecs_to_jiffies(RESET_PROTECTION_MS);
-
- size = bat_priv->num_ifaces * sizeof(TYPE_OF_WORD) * NUM_WORDS;
-
- orig_node->bcast_own = kzalloc(size, GFP_ATOMIC);
- if (!orig_node->bcast_own)
- goto free_orig_node;
-
- size = bat_priv->num_ifaces * sizeof(uint8_t);
- orig_node->bcast_own_sum = kzalloc(size, GFP_ATOMIC);
-
- INIT_LIST_HEAD(&orig_node->frag_list);
- orig_node->last_frag_packet = 0;
-
- if (!orig_node->bcast_own_sum)
- goto free_bcast_own;
-
- hash_added = hash_add(bat_priv->orig_hash, compare_orig, choose_orig,
- orig_node);
- if (hash_added < 0)
- goto free_bcast_own_sum;
-
- if (bat_priv->orig_hash->elements * 4 > bat_priv->orig_hash->size) {
- swaphash = hash_resize(bat_priv->orig_hash, choose_orig,
- bat_priv->orig_hash->size * 2);
-
- if (!swaphash)
- bat_dbg(DBG_BATMAN, bat_priv,
- "Couldn't resize orig hash table\n");
- else
- bat_priv->orig_hash = swaphash;
- }
-
- return orig_node;
-free_bcast_own_sum:
- kfree(orig_node->bcast_own_sum);
-free_bcast_own:
- kfree(orig_node->bcast_own);
-free_orig_node:
- kfree(orig_node);
- return NULL;
-}
-
-static bool purge_orig_neighbors(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
- struct neigh_node **best_neigh_node)
-{
- struct list_head *list_pos, *list_pos_tmp;
- struct neigh_node *neigh_node;
- bool neigh_purged = false;
-
- *best_neigh_node = NULL;
-
- /* for all neighbors towards this originator ... */
- list_for_each_safe(list_pos, list_pos_tmp, &orig_node->neigh_list) {
- neigh_node = list_entry(list_pos, struct neigh_node, list);
-
- if ((time_after(jiffies,
- neigh_node->last_valid + PURGE_TIMEOUT * HZ)) ||
- (neigh_node->if_incoming->if_status == IF_INACTIVE) ||
- (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) {
-
- if (neigh_node->if_incoming->if_status ==
- IF_TO_BE_REMOVED)
- bat_dbg(DBG_BATMAN, bat_priv,
- "neighbor purge: originator %pM, "
- "neighbor: %pM, iface: %s\n",
- orig_node->orig, neigh_node->addr,
- neigh_node->if_incoming->net_dev->name);
- else
- bat_dbg(DBG_BATMAN, bat_priv,
- "neighbor timeout: originator %pM, "
- "neighbor: %pM, last_valid: %lu\n",
- orig_node->orig, neigh_node->addr,
- (neigh_node->last_valid / HZ));
-
- neigh_purged = true;
- list_del(list_pos);
- kfree(neigh_node);
- } else {
- if ((*best_neigh_node == NULL) ||
- (neigh_node->tq_avg > (*best_neigh_node)->tq_avg))
- *best_neigh_node = neigh_node;
- }
- }
- return neigh_purged;
-}
-
-static bool purge_orig_node(struct bat_priv *bat_priv,
- struct orig_node *orig_node)
-{
- struct neigh_node *best_neigh_node;
-
- if (time_after(jiffies,
- orig_node->last_valid + 2 * PURGE_TIMEOUT * HZ)) {
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Originator timeout: originator %pM, last_valid %lu\n",
- orig_node->orig, (orig_node->last_valid / HZ));
- return true;
- } else {
- if (purge_orig_neighbors(bat_priv, orig_node,
- &best_neigh_node)) {
- update_routes(bat_priv, orig_node,
- best_neigh_node,
- orig_node->hna_buff,
- orig_node->hna_buff_len);
- /* update bonding candidates, we could have lost
- * some candidates. */
- update_bonding_candidates(bat_priv, orig_node);
- }
- }
-
- return false;
-}
-
-static void _purge_orig(struct bat_priv *bat_priv)
-{
- HASHIT(hashit);
- struct element_t *bucket;
- struct orig_node *orig_node;
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
-
- /* for all origins... */
- while (hash_iterate(bat_priv->orig_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- orig_node = bucket->data;
-
- if (purge_orig_node(bat_priv, orig_node)) {
- if (orig_node->gw_flags)
- gw_node_delete(bat_priv, orig_node);
- hash_remove_bucket(bat_priv->orig_hash, &hashit);
- free_orig_node(orig_node, bat_priv);
- }
-
- if (time_after(jiffies, (orig_node->last_frag_packet +
- msecs_to_jiffies(FRAG_TIMEOUT))))
- frag_list_free(&orig_node->frag_list);
- }
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- gw_node_purge(bat_priv);
- gw_election(bat_priv);
-
- softif_neigh_purge(bat_priv);
-}
-
-static void purge_orig(struct work_struct *work)
-{
- struct delayed_work *delayed_work =
- container_of(work, struct delayed_work, work);
- struct bat_priv *bat_priv =
- container_of(delayed_work, struct bat_priv, orig_work);
-
- _purge_orig(bat_priv);
- start_purge_timer(bat_priv);
-}
-
-void purge_orig_ref(struct bat_priv *bat_priv)
-{
- _purge_orig(bat_priv);
-}
-
-int orig_seq_print_text(struct seq_file *seq, void *offset)
-{
- HASHIT(hashit);
- struct element_t *bucket;
- struct net_device *net_dev = (struct net_device *)seq->private;
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- struct orig_node *orig_node;
- struct neigh_node *neigh_node;
- int batman_count = 0;
- int last_seen_secs;
- int last_seen_msecs;
-
- if ((!bat_priv->primary_if) ||
- (bat_priv->primary_if->if_status != IF_ACTIVE)) {
- if (!bat_priv->primary_if)
- return seq_printf(seq, "BATMAN mesh %s disabled - "
- "please specify interfaces to enable it\n",
- net_dev->name);
-
- return seq_printf(seq, "BATMAN mesh %s "
- "disabled - primary interface not active\n",
- net_dev->name);
- }
-
- seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n",
- SOURCE_VERSION, REVISION_VERSION_STR,
- bat_priv->primary_if->net_dev->name,
- bat_priv->primary_if->net_dev->dev_addr, net_dev->name);
- seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",
- "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop",
- "outgoingIF", "Potential nexthops");
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
-
- while (hash_iterate(bat_priv->orig_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- orig_node = bucket->data;
-
- if (!orig_node->router)
- continue;
-
- if (orig_node->router->tq_avg == 0)
- continue;
-
- last_seen_secs = jiffies_to_msecs(jiffies -
- orig_node->last_valid) / 1000;
- last_seen_msecs = jiffies_to_msecs(jiffies -
- orig_node->last_valid) % 1000;
-
- seq_printf(seq, "%pM %4i.%03is (%3i) %pM [%10s]:",
- orig_node->orig, last_seen_secs, last_seen_msecs,
- orig_node->router->tq_avg, orig_node->router->addr,
- orig_node->router->if_incoming->net_dev->name);
-
- list_for_each_entry(neigh_node, &orig_node->neigh_list, list) {
- seq_printf(seq, " %pM (%3i)", neigh_node->addr,
- neigh_node->tq_avg);
- }
-
- seq_printf(seq, "\n");
- batman_count++;
- }
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- if ((batman_count == 0))
- seq_printf(seq, "No batman nodes in range ...\n");
-
- return 0;
-}
-
-static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
-{
- void *data_ptr;
-
- data_ptr = kmalloc(max_if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS,
- GFP_ATOMIC);
- if (!data_ptr) {
- pr_err("Can't resize orig: out of memory\n");
- return -1;
- }
-
- memcpy(data_ptr, orig_node->bcast_own,
- (max_if_num - 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS);
- kfree(orig_node->bcast_own);
- orig_node->bcast_own = data_ptr;
-
- data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
- if (!data_ptr) {
- pr_err("Can't resize orig: out of memory\n");
- return -1;
- }
-
- memcpy(data_ptr, orig_node->bcast_own_sum,
- (max_if_num - 1) * sizeof(uint8_t));
- kfree(orig_node->bcast_own_sum);
- orig_node->bcast_own_sum = data_ptr;
-
- return 0;
-}
-
-int orig_hash_add_if(struct batman_if *batman_if, int max_if_num)
-{
- struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
- struct orig_node *orig_node;
- HASHIT(hashit);
- struct element_t *bucket;
-
- /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
- * if_num */
- spin_lock_bh(&bat_priv->orig_hash_lock);
-
- while (hash_iterate(bat_priv->orig_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- orig_node = bucket->data;
-
- if (orig_node_add_if(orig_node, max_if_num) == -1)
- goto err;
- }
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return 0;
-
-err:
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return -ENOMEM;
-}
-
-static int orig_node_del_if(struct orig_node *orig_node,
- int max_if_num, int del_if_num)
-{
- void *data_ptr = NULL;
- int chunk_size;
-
- /* last interface was removed */
- if (max_if_num == 0)
- goto free_bcast_own;
-
- chunk_size = sizeof(TYPE_OF_WORD) * NUM_WORDS;
- data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);
- if (!data_ptr) {
- pr_err("Can't resize orig: out of memory\n");
- return -1;
- }
-
- /* copy first part */
- memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);
-
- /* copy second part */
- memcpy(data_ptr + del_if_num * chunk_size,
- orig_node->bcast_own + ((del_if_num + 1) * chunk_size),
- (max_if_num - del_if_num) * chunk_size);
-
-free_bcast_own:
- kfree(orig_node->bcast_own);
- orig_node->bcast_own = data_ptr;
-
- if (max_if_num == 0)
- goto free_own_sum;
-
- data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
- if (!data_ptr) {
- pr_err("Can't resize orig: out of memory\n");
- return -1;
- }
-
- memcpy(data_ptr, orig_node->bcast_own_sum,
- del_if_num * sizeof(uint8_t));
-
- memcpy(data_ptr + del_if_num * sizeof(uint8_t),
- orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)),
- (max_if_num - del_if_num) * sizeof(uint8_t));
-
-free_own_sum:
- kfree(orig_node->bcast_own_sum);
- orig_node->bcast_own_sum = data_ptr;
-
- return 0;
-}
-
-int orig_hash_del_if(struct batman_if *batman_if, int max_if_num)
-{
- struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
- struct batman_if *batman_if_tmp;
- struct orig_node *orig_node;
- HASHIT(hashit);
- struct element_t *bucket;
- int ret;
-
- /* resize all orig nodes because orig_node->bcast_own(_sum) depend on
- * if_num */
- spin_lock_bh(&bat_priv->orig_hash_lock);
-
- while (hash_iterate(bat_priv->orig_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- orig_node = bucket->data;
-
- ret = orig_node_del_if(orig_node, max_if_num,
- batman_if->if_num);
-
- if (ret == -1)
- goto err;
- }
-
- /* renumber remaining batman interfaces _inside_ of orig_hash_lock */
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if_tmp, &if_list, list) {
- if (batman_if_tmp->if_status == IF_NOT_IN_USE)
- continue;
-
- if (batman_if == batman_if_tmp)
- continue;
-
- if (batman_if->soft_iface != batman_if_tmp->soft_iface)
- continue;
-
- if (batman_if_tmp->if_num > batman_if->if_num)
- batman_if_tmp->if_num--;
- }
- rcu_read_unlock();
-
- batman_if->if_num = -1;
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return 0;
-
-err:
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return -ENOMEM;
-}
diff --git a/drivers/staging/batman-adv/originator.h b/drivers/staging/batman-adv/originator.h
deleted file mode 100644
index d474ceb..0000000
--- a/drivers/staging/batman-adv/originator.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_ORIGINATOR_H_
-#define _NET_BATMAN_ADV_ORIGINATOR_H_
-
-int originator_init(struct bat_priv *bat_priv);
-void originator_free(struct bat_priv *bat_priv);
-void purge_orig_ref(struct bat_priv *bat_priv);
-struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr);
-struct neigh_node *
-create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node,
- uint8_t *neigh, struct batman_if *if_incoming);
-int orig_seq_print_text(struct seq_file *seq, void *offset);
-int orig_hash_add_if(struct batman_if *batman_if, int max_if_num);
-int orig_hash_del_if(struct batman_if *batman_if, int max_if_num);
-
-
-/* returns 1 if they are the same originator */
-static inline int compare_orig(void *data1, void *data2)
-{
- return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
-}
-
-/* hashfunction to choose an entry in a hash table of given size */
-/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */
-static inline int choose_orig(void *data, int32_t size)
-{
- unsigned char *key = data;
- uint32_t hash = 0;
- size_t i;
-
- for (i = 0; i < 6; i++) {
- hash += key[i];
- hash += (hash << 10);
- hash ^= (hash >> 6);
- }
-
- hash += (hash << 3);
- hash ^= (hash >> 11);
- hash += (hash << 15);
-
- return hash % size;
-}
-
-#endif /* _NET_BATMAN_ADV_ORIGINATOR_H_ */
diff --git a/drivers/staging/batman-adv/packet.h b/drivers/staging/batman-adv/packet.h
deleted file mode 100644
index b49fdf7..0000000
--- a/drivers/staging/batman-adv/packet.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_PACKET_H_
-#define _NET_BATMAN_ADV_PACKET_H_
-
-#define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */
-
-#define BAT_PACKET 0x01
-#define BAT_ICMP 0x02
-#define BAT_UNICAST 0x03
-#define BAT_BCAST 0x04
-#define BAT_VIS 0x05
-#define BAT_UNICAST_FRAG 0x06
-
-/* this file is included by batctl which needs these defines */
-#define COMPAT_VERSION 12
-#define DIRECTLINK 0x40
-#define VIS_SERVER 0x20
-#define PRIMARIES_FIRST_HOP 0x10
-
-/* ICMP message types */
-#define ECHO_REPLY 0
-#define DESTINATION_UNREACHABLE 3
-#define ECHO_REQUEST 8
-#define TTL_EXCEEDED 11
-#define PARAMETER_PROBLEM 12
-
-/* vis defines */
-#define VIS_TYPE_SERVER_SYNC 0
-#define VIS_TYPE_CLIENT_UPDATE 1
-
-/* fragmentation defines */
-#define UNI_FRAG_HEAD 0x01
-
-struct batman_packet {
- uint8_t packet_type;
- uint8_t version; /* batman version field */
- uint8_t flags; /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
- uint8_t tq;
- uint32_t seqno;
- uint8_t orig[6];
- uint8_t prev_sender[6];
- uint8_t ttl;
- uint8_t num_hna;
- uint8_t gw_flags; /* flags related to gateway class */
- uint8_t align;
-} __attribute__((packed));
-
-#define BAT_PACKET_LEN sizeof(struct batman_packet)
-
-struct icmp_packet {
- uint8_t packet_type;
- uint8_t version; /* batman version field */
- uint8_t msg_type; /* see ICMP message types above */
- uint8_t ttl;
- uint8_t dst[6];
- uint8_t orig[6];
- uint16_t seqno;
- uint8_t uid;
-} __attribute__((packed));
-
-#define BAT_RR_LEN 16
-
-/* icmp_packet_rr must start with all fields from imcp_packet
- * as this is assumed by code that handles ICMP packets */
-struct icmp_packet_rr {
- uint8_t packet_type;
- uint8_t version; /* batman version field */
- uint8_t msg_type; /* see ICMP message types above */
- uint8_t ttl;
- uint8_t dst[6];
- uint8_t orig[6];
- uint16_t seqno;
- uint8_t uid;
- uint8_t rr_cur;
- uint8_t rr[BAT_RR_LEN][ETH_ALEN];
-} __attribute__((packed));
-
-struct unicast_packet {
- uint8_t packet_type;
- uint8_t version; /* batman version field */
- uint8_t dest[6];
- uint8_t ttl;
-} __attribute__((packed));
-
-struct unicast_frag_packet {
- uint8_t packet_type;
- uint8_t version; /* batman version field */
- uint8_t dest[6];
- uint8_t ttl;
- uint8_t flags;
- uint8_t orig[6];
- uint16_t seqno;
-} __attribute__((packed));
-
-struct bcast_packet {
- uint8_t packet_type;
- uint8_t version; /* batman version field */
- uint8_t orig[6];
- uint8_t ttl;
- uint32_t seqno;
-} __attribute__((packed));
-
-struct vis_packet {
- uint8_t packet_type;
- uint8_t version; /* batman version field */
- uint8_t vis_type; /* which type of vis-participant sent this? */
- uint8_t entries; /* number of entries behind this struct */
- uint32_t seqno; /* sequence number */
- uint8_t ttl; /* TTL */
- uint8_t vis_orig[6]; /* originator that informs about its
- * neighbors */
- uint8_t target_orig[6]; /* who should receive this packet */
- uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */
-} __attribute__((packed));
-
-#endif /* _NET_BATMAN_ADV_PACKET_H_ */
diff --git a/drivers/staging/batman-adv/ring_buffer.c b/drivers/staging/batman-adv/ring_buffer.c
deleted file mode 100644
index defd37c..0000000
--- a/drivers/staging/batman-adv/ring_buffer.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "ring_buffer.h"
-
-void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value)
-{
- lq_recv[*lq_index] = value;
- *lq_index = (*lq_index + 1) % TQ_GLOBAL_WINDOW_SIZE;
-}
-
-uint8_t ring_buffer_avg(uint8_t lq_recv[])
-{
- uint8_t *ptr;
- uint16_t count = 0, i = 0, sum = 0;
-
- ptr = lq_recv;
-
- while (i < TQ_GLOBAL_WINDOW_SIZE) {
- if (*ptr != 0) {
- count++;
- sum += *ptr;
- }
-
- i++;
- ptr++;
- }
-
- if (count == 0)
- return 0;
-
- return (uint8_t)(sum / count);
-}
diff --git a/drivers/staging/batman-adv/ring_buffer.h b/drivers/staging/batman-adv/ring_buffer.h
deleted file mode 100644
index 6b0cb9a..0000000
--- a/drivers/staging/batman-adv/ring_buffer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_RING_BUFFER_H_
-#define _NET_BATMAN_ADV_RING_BUFFER_H_
-
-void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value);
-uint8_t ring_buffer_avg(uint8_t lq_recv[]);
-
-#endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */
diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
deleted file mode 100644
index d8b0c5a..0000000
--- a/drivers/staging/batman-adv/routing.c
+++ /dev/null
@@ -1,1393 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "routing.h"
-#include "send.h"
-#include "hash.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "icmp_socket.h"
-#include "translation-table.h"
-#include "originator.h"
-#include "types.h"
-#include "ring_buffer.h"
-#include "vis.h"
-#include "aggregation.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "unicast.h"
-
-void slide_own_bcast_window(struct batman_if *batman_if)
-{
- struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
- HASHIT(hashit);
- struct element_t *bucket;
- struct orig_node *orig_node;
- TYPE_OF_WORD *word;
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
-
- while (hash_iterate(bat_priv->orig_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- orig_node = bucket->data;
- word = &(orig_node->bcast_own[batman_if->if_num * NUM_WORDS]);
-
- bit_get_packet(bat_priv, word, 1, 0);
- orig_node->bcast_own_sum[batman_if->if_num] =
- bit_packet_count(word);
- }
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-}
-
-static void update_HNA(struct bat_priv *bat_priv, struct orig_node *orig_node,
- unsigned char *hna_buff, int hna_buff_len)
-{
- if ((hna_buff_len != orig_node->hna_buff_len) ||
- ((hna_buff_len > 0) &&
- (orig_node->hna_buff_len > 0) &&
- (memcmp(orig_node->hna_buff, hna_buff, hna_buff_len) != 0))) {
-
- if (orig_node->hna_buff_len > 0)
- hna_global_del_orig(bat_priv, orig_node,
- "originator changed hna");
-
- if ((hna_buff_len > 0) && (hna_buff != NULL))
- hna_global_add_orig(bat_priv, orig_node,
- hna_buff, hna_buff_len);
- }
-}
-
-static void update_route(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
- struct neigh_node *neigh_node,
- unsigned char *hna_buff, int hna_buff_len)
-{
- /* route deleted */
- if ((orig_node->router != NULL) && (neigh_node == NULL)) {
-
- bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n",
- orig_node->orig);
- hna_global_del_orig(bat_priv, orig_node,
- "originator timed out");
-
- /* route added */
- } else if ((orig_node->router == NULL) && (neigh_node != NULL)) {
-
- bat_dbg(DBG_ROUTES, bat_priv,
- "Adding route towards: %pM (via %pM)\n",
- orig_node->orig, neigh_node->addr);
- hna_global_add_orig(bat_priv, orig_node,
- hna_buff, hna_buff_len);
-
- /* route changed */
- } else {
- bat_dbg(DBG_ROUTES, bat_priv,
- "Changing route towards: %pM "
- "(now via %pM - was via %pM)\n",
- orig_node->orig, neigh_node->addr,
- orig_node->router->addr);
- }
-
- orig_node->router = neigh_node;
-}
-
-
-void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
- struct neigh_node *neigh_node, unsigned char *hna_buff,
- int hna_buff_len)
-{
-
- if (orig_node == NULL)
- return;
-
- if (orig_node->router != neigh_node)
- update_route(bat_priv, orig_node, neigh_node,
- hna_buff, hna_buff_len);
- /* may be just HNA changed */
- else
- update_HNA(bat_priv, orig_node, hna_buff, hna_buff_len);
-}
-
-static int is_bidirectional_neigh(struct orig_node *orig_node,
- struct orig_node *orig_neigh_node,
- struct batman_packet *batman_packet,
- struct batman_if *if_incoming)
-{
- struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
- unsigned char total_count;
-
- if (orig_node == orig_neigh_node) {
- list_for_each_entry(tmp_neigh_node,
- &orig_node->neigh_list,
- list) {
-
- if (compare_orig(tmp_neigh_node->addr,
- orig_neigh_node->orig) &&
- (tmp_neigh_node->if_incoming == if_incoming))
- neigh_node = tmp_neigh_node;
- }
-
- if (!neigh_node)
- neigh_node = create_neighbor(orig_node,
- orig_neigh_node,
- orig_neigh_node->orig,
- if_incoming);
- /* create_neighbor failed, return 0 */
- if (!neigh_node)
- return 0;
-
- neigh_node->last_valid = jiffies;
- } else {
- /* find packet count of corresponding one hop neighbor */
- list_for_each_entry(tmp_neigh_node,
- &orig_neigh_node->neigh_list, list) {
-
- if (compare_orig(tmp_neigh_node->addr,
- orig_neigh_node->orig) &&
- (tmp_neigh_node->if_incoming == if_incoming))
- neigh_node = tmp_neigh_node;
- }
-
- if (!neigh_node)
- neigh_node = create_neighbor(orig_neigh_node,
- orig_neigh_node,
- orig_neigh_node->orig,
- if_incoming);
- /* create_neighbor failed, return 0 */
- if (!neigh_node)
- return 0;
- }
-
- orig_node->last_valid = jiffies;
-
- /* pay attention to not get a value bigger than 100 % */
- total_count = (orig_neigh_node->bcast_own_sum[if_incoming->if_num] >
- neigh_node->real_packet_count ?
- neigh_node->real_packet_count :
- orig_neigh_node->bcast_own_sum[if_incoming->if_num]);
-
- /* if we have too few packets (too less data) we set tq_own to zero */
- /* if we receive too few packets it is not considered bidirectional */
- if ((total_count < TQ_LOCAL_BIDRECT_SEND_MINIMUM) ||
- (neigh_node->real_packet_count < TQ_LOCAL_BIDRECT_RECV_MINIMUM))
- orig_neigh_node->tq_own = 0;
- else
- /* neigh_node->real_packet_count is never zero as we
- * only purge old information when getting new
- * information */
- orig_neigh_node->tq_own = (TQ_MAX_VALUE * total_count) /
- neigh_node->real_packet_count;
-
- /*
- * 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE this does
- * affect the nearly-symmetric links only a little, but
- * punishes asymmetric links more. This will give a value
- * between 0 and TQ_MAX_VALUE
- */
- orig_neigh_node->tq_asym_penalty =
- TQ_MAX_VALUE -
- (TQ_MAX_VALUE *
- (TQ_LOCAL_WINDOW_SIZE - neigh_node->real_packet_count) *
- (TQ_LOCAL_WINDOW_SIZE - neigh_node->real_packet_count) *
- (TQ_LOCAL_WINDOW_SIZE - neigh_node->real_packet_count)) /
- (TQ_LOCAL_WINDOW_SIZE *
- TQ_LOCAL_WINDOW_SIZE *
- TQ_LOCAL_WINDOW_SIZE);
-
- batman_packet->tq = ((batman_packet->tq *
- orig_neigh_node->tq_own *
- orig_neigh_node->tq_asym_penalty) /
- (TQ_MAX_VALUE * TQ_MAX_VALUE));
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "bidirectional: "
- "orig = %-15pM neigh = %-15pM => own_bcast = %2i, "
- "real recv = %2i, local tq: %3i, asym_penalty: %3i, "
- "total tq: %3i\n",
- orig_node->orig, orig_neigh_node->orig, total_count,
- neigh_node->real_packet_count, orig_neigh_node->tq_own,
- orig_neigh_node->tq_asym_penalty, batman_packet->tq);
-
- /* if link has the minimum required transmission quality
- * consider it bidirectional */
- if (batman_packet->tq >= TQ_TOTAL_BIDRECT_LIMIT)
- return 1;
-
- return 0;
-}
-
-static void update_orig(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
- struct ethhdr *ethhdr,
- struct batman_packet *batman_packet,
- struct batman_if *if_incoming,
- unsigned char *hna_buff, int hna_buff_len,
- char is_duplicate)
-{
- struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
- int tmp_hna_buff_len;
-
- bat_dbg(DBG_BATMAN, bat_priv, "update_originator(): "
- "Searching and updating originator entry of received packet\n");
-
- list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
- if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) &&
- (tmp_neigh_node->if_incoming == if_incoming)) {
- neigh_node = tmp_neigh_node;
- continue;
- }
-
- if (is_duplicate)
- continue;
-
- ring_buffer_set(tmp_neigh_node->tq_recv,
- &tmp_neigh_node->tq_index, 0);
- tmp_neigh_node->tq_avg =
- ring_buffer_avg(tmp_neigh_node->tq_recv);
- }
-
- if (!neigh_node) {
- struct orig_node *orig_tmp;
-
- orig_tmp = get_orig_node(bat_priv, ethhdr->h_source);
- if (!orig_tmp)
- return;
-
- neigh_node = create_neighbor(orig_node, orig_tmp,
- ethhdr->h_source, if_incoming);
- if (!neigh_node)
- return;
- } else
- bat_dbg(DBG_BATMAN, bat_priv,
- "Updating existing last-hop neighbor of originator\n");
-
- orig_node->flags = batman_packet->flags;
- neigh_node->last_valid = jiffies;
-
- ring_buffer_set(neigh_node->tq_recv,
- &neigh_node->tq_index,
- batman_packet->tq);
- neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv);
-
- if (!is_duplicate) {
- orig_node->last_ttl = batman_packet->ttl;
- neigh_node->last_ttl = batman_packet->ttl;
- }
-
- tmp_hna_buff_len = (hna_buff_len > batman_packet->num_hna * ETH_ALEN ?
- batman_packet->num_hna * ETH_ALEN : hna_buff_len);
-
- /* if this neighbor already is our next hop there is nothing
- * to change */
- if (orig_node->router == neigh_node)
- goto update_hna;
-
- /* if this neighbor does not offer a better TQ we won't consider it */
- if ((orig_node->router) &&
- (orig_node->router->tq_avg > neigh_node->tq_avg))
- goto update_hna;
-
- /* if the TQ is the same and the link not more symetric we
- * won't consider it either */
- if ((orig_node->router) &&
- ((neigh_node->tq_avg == orig_node->router->tq_avg) &&
- (orig_node->router->orig_node->bcast_own_sum[if_incoming->if_num]
- >= neigh_node->orig_node->bcast_own_sum[if_incoming->if_num])))
- goto update_hna;
-
- update_routes(bat_priv, orig_node, neigh_node,
- hna_buff, tmp_hna_buff_len);
- goto update_gw;
-
-update_hna:
- update_routes(bat_priv, orig_node, orig_node->router,
- hna_buff, tmp_hna_buff_len);
-
-update_gw:
- if (orig_node->gw_flags != batman_packet->gw_flags)
- gw_node_update(bat_priv, orig_node, batman_packet->gw_flags);
-
- orig_node->gw_flags = batman_packet->gw_flags;
-
- /* restart gateway selection if fast or late switching was enabled */
- if ((orig_node->gw_flags) &&
- (atomic_read(&bat_priv->gw_mode) == GW_MODE_CLIENT) &&
- (atomic_read(&bat_priv->gw_sel_class) > 2))
- gw_check_election(bat_priv, orig_node);
-}
-
-/* checks whether the host restarted and is in the protection time.
- * returns:
- * 0 if the packet is to be accepted
- * 1 if the packet is to be ignored.
- */
-static int window_protected(struct bat_priv *bat_priv,
- int32_t seq_num_diff,
- unsigned long *last_reset)
-{
- if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)
- || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {
- if (time_after(jiffies, *last_reset +
- msecs_to_jiffies(RESET_PROTECTION_MS))) {
-
- *last_reset = jiffies;
- bat_dbg(DBG_BATMAN, bat_priv,
- "old packet received, start protection\n");
-
- return 0;
- } else
- return 1;
- }
- return 0;
-}
-
-/* processes a batman packet for all interfaces, adjusts the sequence number and
- * finds out whether it is a duplicate.
- * returns:
- * 1 the packet is a duplicate
- * 0 the packet has not yet been received
- * -1 the packet is old and has been received while the seqno window
- * was protected. Caller should drop it.
- */
-static char count_real_packets(struct ethhdr *ethhdr,
- struct batman_packet *batman_packet,
- struct batman_if *if_incoming)
-{
- struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- struct orig_node *orig_node;
- struct neigh_node *tmp_neigh_node;
- char is_duplicate = 0;
- int32_t seq_diff;
- int need_update = 0;
- int set_mark;
-
- orig_node = get_orig_node(bat_priv, batman_packet->orig);
- if (orig_node == NULL)
- return 0;
-
- seq_diff = batman_packet->seqno - orig_node->last_real_seqno;
-
- /* signalize caller that the packet is to be dropped. */
- if (window_protected(bat_priv, seq_diff,
- &orig_node->batman_seqno_reset))
- return -1;
-
- list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
-
- is_duplicate |= get_bit_status(tmp_neigh_node->real_bits,
- orig_node->last_real_seqno,
- batman_packet->seqno);
-
- if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) &&
- (tmp_neigh_node->if_incoming == if_incoming))
- set_mark = 1;
- else
- set_mark = 0;
-
- /* if the window moved, set the update flag. */
- need_update |= bit_get_packet(bat_priv,
- tmp_neigh_node->real_bits,
- seq_diff, set_mark);
-
- tmp_neigh_node->real_packet_count =
- bit_packet_count(tmp_neigh_node->real_bits);
- }
-
- if (need_update) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "updating last_seqno: old %d, new %d\n",
- orig_node->last_real_seqno, batman_packet->seqno);
- orig_node->last_real_seqno = batman_packet->seqno;
- }
-
- return is_duplicate;
-}
-
-/* copy primary address for bonding */
-static void mark_bonding_address(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
- struct orig_node *orig_neigh_node,
- struct batman_packet *batman_packet)
-
-{
- if (batman_packet->flags & PRIMARIES_FIRST_HOP)
- memcpy(orig_neigh_node->primary_addr,
- orig_node->orig, ETH_ALEN);
-
- return;
-}
-
-/* mark possible bond.candidates in the neighbor list */
-void update_bonding_candidates(struct bat_priv *bat_priv,
- struct orig_node *orig_node)
-{
- int candidates;
- int interference_candidate;
- int best_tq;
- struct neigh_node *tmp_neigh_node, *tmp_neigh_node2;
- struct neigh_node *first_candidate, *last_candidate;
-
- /* update the candidates for this originator */
- if (!orig_node->router) {
- orig_node->bond.candidates = 0;
- return;
- }
-
- best_tq = orig_node->router->tq_avg;
-
- /* update bond.candidates */
-
- candidates = 0;
-
- /* mark other nodes which also received "PRIMARIES FIRST HOP" packets
- * as "bonding partner" */
-
- /* first, zero the list */
- list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
- tmp_neigh_node->next_bond_candidate = NULL;
- }
-
- first_candidate = NULL;
- last_candidate = NULL;
- list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
-
- /* only consider if it has the same primary address ... */
- if (memcmp(orig_node->orig,
- tmp_neigh_node->orig_node->primary_addr,
- ETH_ALEN) != 0)
- continue;
-
- /* ... and is good enough to be considered */
- if (tmp_neigh_node->tq_avg < best_tq - BONDING_TQ_THRESHOLD)
- continue;
-
- /* check if we have another candidate with the same
- * mac address or interface. If we do, we won't
- * select this candidate because of possible interference. */
-
- interference_candidate = 0;
- list_for_each_entry(tmp_neigh_node2,
- &orig_node->neigh_list, list) {
-
- if (tmp_neigh_node2 == tmp_neigh_node)
- continue;
-
- /* we only care if the other candidate is even
- * considered as candidate. */
- if (tmp_neigh_node2->next_bond_candidate == NULL)
- continue;
-
-
- if ((tmp_neigh_node->if_incoming ==
- tmp_neigh_node2->if_incoming)
- || (memcmp(tmp_neigh_node->addr,
- tmp_neigh_node2->addr, ETH_ALEN) == 0)) {
-
- interference_candidate = 1;
- break;
- }
- }
- /* don't care further if it is an interference candidate */
- if (interference_candidate)
- continue;
-
- if (first_candidate == NULL) {
- first_candidate = tmp_neigh_node;
- tmp_neigh_node->next_bond_candidate = first_candidate;
- } else
- tmp_neigh_node->next_bond_candidate = last_candidate;
-
- last_candidate = tmp_neigh_node;
-
- candidates++;
- }
-
- if (candidates > 0) {
- first_candidate->next_bond_candidate = last_candidate;
- orig_node->bond.selected = first_candidate;
- }
-
- orig_node->bond.candidates = candidates;
-}
-
-void receive_bat_packet(struct ethhdr *ethhdr,
- struct batman_packet *batman_packet,
- unsigned char *hna_buff, int hna_buff_len,
- struct batman_if *if_incoming)
-{
- struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- struct batman_if *batman_if;
- struct orig_node *orig_neigh_node, *orig_node;
- char has_directlink_flag;
- char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
- char is_broadcast = 0, is_bidirectional, is_single_hop_neigh;
- char is_duplicate;
- uint32_t if_incoming_seqno;
-
- /* Silently drop when the batman packet is actually not a
- * correct packet.
- *
- * This might happen if a packet is padded (e.g. Ethernet has a
- * minimum frame length of 64 byte) and the aggregation interprets
- * it as an additional length.
- *
- * TODO: A more sane solution would be to have a bit in the
- * batman_packet to detect whether the packet is the last
- * packet in an aggregation. Here we expect that the padding
- * is always zero (or not 0x01)
- */
- if (batman_packet->packet_type != BAT_PACKET)
- return;
-
- /* could be changed by schedule_own_packet() */
- if_incoming_seqno = atomic_read(&if_incoming->seqno);
-
- has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
-
- is_single_hop_neigh = (compare_orig(ethhdr->h_source,
- batman_packet->orig) ? 1 : 0);
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Received BATMAN packet via NB: %pM, IF: %s [%pM] "
- "(from OG: %pM, via prev OG: %pM, seqno %d, tq %d, "
- "TTL %d, V %d, IDF %d)\n",
- ethhdr->h_source, if_incoming->net_dev->name,
- if_incoming->net_dev->dev_addr, batman_packet->orig,
- batman_packet->prev_sender, batman_packet->seqno,
- batman_packet->tq, batman_packet->ttl, batman_packet->version,
- has_directlink_flag);
-
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if (batman_if->if_status != IF_ACTIVE)
- continue;
-
- if (batman_if->soft_iface != if_incoming->soft_iface)
- continue;
-
- if (compare_orig(ethhdr->h_source,
- batman_if->net_dev->dev_addr))
- is_my_addr = 1;
-
- if (compare_orig(batman_packet->orig,
- batman_if->net_dev->dev_addr))
- is_my_orig = 1;
-
- if (compare_orig(batman_packet->prev_sender,
- batman_if->net_dev->dev_addr))
- is_my_oldorig = 1;
-
- if (compare_orig(ethhdr->h_source, broadcast_addr))
- is_broadcast = 1;
- }
- rcu_read_unlock();
-
- if (batman_packet->version != COMPAT_VERSION) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: incompatible batman version (%i)\n",
- batman_packet->version);
- return;
- }
-
- if (is_my_addr) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: received my own broadcast (sender: %pM"
- ")\n",
- ethhdr->h_source);
- return;
- }
-
- if (is_broadcast) {
- bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: "
- "ignoring all packets with broadcast source addr (sender: %pM"
- ")\n", ethhdr->h_source);
- return;
- }
-
- if (is_my_orig) {
- TYPE_OF_WORD *word;
- int offset;
-
- orig_neigh_node = get_orig_node(bat_priv, ethhdr->h_source);
-
- if (!orig_neigh_node)
- return;
-
- /* neighbor has to indicate direct link and it has to
- * come via the corresponding interface */
- /* if received seqno equals last send seqno save new
- * seqno for bidirectional check */
- if (has_directlink_flag &&
- compare_orig(if_incoming->net_dev->dev_addr,
- batman_packet->orig) &&
- (batman_packet->seqno - if_incoming_seqno + 2 == 0)) {
- offset = if_incoming->if_num * NUM_WORDS;
- word = &(orig_neigh_node->bcast_own[offset]);
- bit_mark(word, 0);
- orig_neigh_node->bcast_own_sum[if_incoming->if_num] =
- bit_packet_count(word);
- }
-
- bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: "
- "originator packet from myself (via neighbor)\n");
- return;
- }
-
- if (is_my_oldorig) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: ignoring all rebroadcast echos (sender: "
- "%pM)\n", ethhdr->h_source);
- return;
- }
-
- orig_node = get_orig_node(bat_priv, batman_packet->orig);
- if (orig_node == NULL)
- return;
-
- is_duplicate = count_real_packets(ethhdr, batman_packet, if_incoming);
-
- if (is_duplicate == -1) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: packet within seqno protection time "
- "(sender: %pM)\n", ethhdr->h_source);
- return;
- }
-
- if (batman_packet->tq == 0) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: originator packet with tq equal 0\n");
- return;
- }
-
- /* avoid temporary routing loops */
- if ((orig_node->router) &&
- (orig_node->router->orig_node->router) &&
- (compare_orig(orig_node->router->addr,
- batman_packet->prev_sender)) &&
- !(compare_orig(batman_packet->orig, batman_packet->prev_sender)) &&
- (compare_orig(orig_node->router->addr,
- orig_node->router->orig_node->router->addr))) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: ignoring all rebroadcast packets that "
- "may make me loop (sender: %pM)\n", ethhdr->h_source);
- return;
- }
-
- /* if sender is a direct neighbor the sender mac equals
- * originator mac */
- orig_neigh_node = (is_single_hop_neigh ?
- orig_node :
- get_orig_node(bat_priv, ethhdr->h_source));
- if (orig_neigh_node == NULL)
- return;
-
- /* drop packet if sender is not a direct neighbor and if we
- * don't route towards it */
- if (!is_single_hop_neigh &&
- (orig_neigh_node->router == NULL)) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: OGM via unknown neighbor!\n");
- return;
- }
-
- is_bidirectional = is_bidirectional_neigh(orig_node, orig_neigh_node,
- batman_packet, if_incoming);
-
- /* update ranking if it is not a duplicate or has the same
- * seqno and similar ttl as the non-duplicate */
- if (is_bidirectional &&
- (!is_duplicate ||
- ((orig_node->last_real_seqno == batman_packet->seqno) &&
- (orig_node->last_ttl - 3 <= batman_packet->ttl))))
- update_orig(bat_priv, orig_node, ethhdr, batman_packet,
- if_incoming, hna_buff, hna_buff_len, is_duplicate);
-
- mark_bonding_address(bat_priv, orig_node,
- orig_neigh_node, batman_packet);
- update_bonding_candidates(bat_priv, orig_node);
-
- /* is single hop (direct) neighbor */
- if (is_single_hop_neigh) {
-
- /* mark direct link on incoming interface */
- schedule_forward_packet(orig_node, ethhdr, batman_packet,
- 1, hna_buff_len, if_incoming);
-
- bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: "
- "rebroadcast neighbor packet with direct link flag\n");
- return;
- }
-
- /* multihop originator */
- if (!is_bidirectional) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: not received via bidirectional link\n");
- return;
- }
-
- if (is_duplicate) {
- bat_dbg(DBG_BATMAN, bat_priv,
- "Drop packet: duplicate packet received\n");
- return;
- }
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Forwarding packet: rebroadcast originator packet\n");
- schedule_forward_packet(orig_node, ethhdr, batman_packet,
- 0, hna_buff_len, if_incoming);
-}
-
-int recv_bat_packet(struct sk_buff *skb, struct batman_if *batman_if)
-{
- struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
- struct ethhdr *ethhdr;
-
- /* drop packet if it has not necessary minimum size */
- if (unlikely(!pskb_may_pull(skb, sizeof(struct batman_packet))))
- return NET_RX_DROP;
-
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* packet with broadcast indication but unicast recipient */
- if (!is_broadcast_ether_addr(ethhdr->h_dest))
- return NET_RX_DROP;
-
- /* packet with broadcast sender address */
- if (is_broadcast_ether_addr(ethhdr->h_source))
- return NET_RX_DROP;
-
- /* create a copy of the skb, if needed, to modify it. */
- if (skb_cow(skb, 0) < 0)
- return NET_RX_DROP;
-
- /* keep skb linear */
- if (skb_linearize(skb) < 0)
- return NET_RX_DROP;
-
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- receive_aggr_bat_packet(ethhdr,
- skb->data,
- skb_headlen(skb),
- batman_if);
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- kfree_skb(skb);
- return NET_RX_SUCCESS;
-}
-
-static int recv_my_icmp_packet(struct bat_priv *bat_priv,
- struct sk_buff *skb, size_t icmp_len)
-{
- struct orig_node *orig_node;
- struct icmp_packet_rr *icmp_packet;
- struct ethhdr *ethhdr;
- struct batman_if *batman_if;
- int ret;
- uint8_t dstaddr[ETH_ALEN];
-
- icmp_packet = (struct icmp_packet_rr *)skb->data;
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* add data to device queue */
- if (icmp_packet->msg_type != ECHO_REQUEST) {
- bat_socket_receive_packet(icmp_packet, icmp_len);
- return NET_RX_DROP;
- }
-
- if (!bat_priv->primary_if)
- return NET_RX_DROP;
-
- /* answer echo request (ping) */
- /* get routing information */
- spin_lock_bh(&bat_priv->orig_hash_lock);
- orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
- compare_orig, choose_orig,
- icmp_packet->orig));
- ret = NET_RX_DROP;
-
- if ((orig_node != NULL) &&
- (orig_node->router != NULL)) {
-
- /* don't lock while sending the packets ... we therefore
- * copy the required data before sending */
- batman_if = orig_node->router->if_incoming;
- memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- /* create a copy of the skb, if needed, to modify it. */
- if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
- return NET_RX_DROP;
-
- icmp_packet = (struct icmp_packet_rr *)skb->data;
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
- memcpy(icmp_packet->orig,
- bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
- icmp_packet->msg_type = ECHO_REPLY;
- icmp_packet->ttl = TTL;
-
- send_skb_packet(skb, batman_if, dstaddr);
- ret = NET_RX_SUCCESS;
-
- } else
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- return ret;
-}
-
-static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
- struct sk_buff *skb, size_t icmp_len)
-{
- struct orig_node *orig_node;
- struct icmp_packet *icmp_packet;
- struct ethhdr *ethhdr;
- struct batman_if *batman_if;
- int ret;
- uint8_t dstaddr[ETH_ALEN];
-
- icmp_packet = (struct icmp_packet *)skb->data;
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* send TTL exceeded if packet is an echo request (traceroute) */
- if (icmp_packet->msg_type != ECHO_REQUEST) {
- pr_debug("Warning - can't forward icmp packet from %pM to "
- "%pM: ttl exceeded\n", icmp_packet->orig,
- icmp_packet->dst);
- return NET_RX_DROP;
- }
-
- if (!bat_priv->primary_if)
- return NET_RX_DROP;
-
- /* get routing information */
- spin_lock_bh(&bat_priv->orig_hash_lock);
- orig_node = ((struct orig_node *)
- hash_find(bat_priv->orig_hash, compare_orig, choose_orig,
- icmp_packet->orig));
- ret = NET_RX_DROP;
-
- if ((orig_node != NULL) &&
- (orig_node->router != NULL)) {
-
- /* don't lock while sending the packets ... we therefore
- * copy the required data before sending */
- batman_if = orig_node->router->if_incoming;
- memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- /* create a copy of the skb, if needed, to modify it. */
- if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
- return NET_RX_DROP;
-
- icmp_packet = (struct icmp_packet *) skb->data;
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
- memcpy(icmp_packet->orig,
- bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
- icmp_packet->msg_type = TTL_EXCEEDED;
- icmp_packet->ttl = TTL;
-
- send_skb_packet(skb, batman_if, dstaddr);
- ret = NET_RX_SUCCESS;
-
- } else
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- return ret;
-}
-
-
-int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
- struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
- struct icmp_packet_rr *icmp_packet;
- struct ethhdr *ethhdr;
- struct orig_node *orig_node;
- struct batman_if *batman_if;
- int hdr_size = sizeof(struct icmp_packet);
- int ret;
- uint8_t dstaddr[ETH_ALEN];
-
- /**
- * we truncate all incoming icmp packets if they don't match our size
- */
- if (skb->len >= sizeof(struct icmp_packet_rr))
- hdr_size = sizeof(struct icmp_packet_rr);
-
- /* drop packet if it has not necessary minimum size */
- if (unlikely(!pskb_may_pull(skb, hdr_size)))
- return NET_RX_DROP;
-
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* packet with unicast indication but broadcast recipient */
- if (is_broadcast_ether_addr(ethhdr->h_dest))
- return NET_RX_DROP;
-
- /* packet with broadcast sender address */
- if (is_broadcast_ether_addr(ethhdr->h_source))
- return NET_RX_DROP;
-
- /* not for me */
- if (!is_my_mac(ethhdr->h_dest))
- return NET_RX_DROP;
-
- icmp_packet = (struct icmp_packet_rr *)skb->data;
-
- /* add record route information if not full */
- if ((hdr_size == sizeof(struct icmp_packet_rr)) &&
- (icmp_packet->rr_cur < BAT_RR_LEN)) {
- memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]),
- ethhdr->h_dest, ETH_ALEN);
- icmp_packet->rr_cur++;
- }
-
- /* packet for me */
- if (is_my_mac(icmp_packet->dst))
- return recv_my_icmp_packet(bat_priv, skb, hdr_size);
-
- /* TTL exceeded */
- if (icmp_packet->ttl < 2)
- return recv_icmp_ttl_exceeded(bat_priv, skb, hdr_size);
-
- ret = NET_RX_DROP;
-
- /* get routing information */
- spin_lock_bh(&bat_priv->orig_hash_lock);
- orig_node = ((struct orig_node *)
- hash_find(bat_priv->orig_hash, compare_orig, choose_orig,
- icmp_packet->dst));
-
- if ((orig_node != NULL) &&
- (orig_node->router != NULL)) {
-
- /* don't lock while sending the packets ... we therefore
- * copy the required data before sending */
- batman_if = orig_node->router->if_incoming;
- memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- /* create a copy of the skb, if needed, to modify it. */
- if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
- return NET_RX_DROP;
-
- icmp_packet = (struct icmp_packet_rr *)skb->data;
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* decrement ttl */
- icmp_packet->ttl--;
-
- /* route it */
- send_skb_packet(skb, batman_if, dstaddr);
- ret = NET_RX_SUCCESS;
-
- } else
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- return ret;
-}
-
-/* find a suitable router for this originator, and use
- * bonding if possible. */
-struct neigh_node *find_router(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
- struct batman_if *recv_if)
-{
- struct orig_node *primary_orig_node;
- struct orig_node *router_orig;
- struct neigh_node *router, *first_candidate, *best_router;
- static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
- int bonding_enabled;
-
- if (!orig_node)
- return NULL;
-
- if (!orig_node->router)
- return NULL;
-
- /* without bonding, the first node should
- * always choose the default router. */
-
- bonding_enabled = atomic_read(&bat_priv->bonding);
-
- if ((!recv_if) && (!bonding_enabled))
- return orig_node->router;
-
- router_orig = orig_node->router->orig_node;
-
- /* if we have something in the primary_addr, we can search
- * for a potential bonding candidate. */
- if (memcmp(router_orig->primary_addr, zero_mac, ETH_ALEN) == 0)
- return orig_node->router;
-
- /* find the orig_node which has the primary interface. might
- * even be the same as our router_orig in many cases */
-
- if (memcmp(router_orig->primary_addr,
- router_orig->orig, ETH_ALEN) == 0) {
- primary_orig_node = router_orig;
- } else {
- primary_orig_node = hash_find(bat_priv->orig_hash, compare_orig,
- choose_orig,
- router_orig->primary_addr);
-
- if (!primary_orig_node)
- return orig_node->router;
- }
-
- /* with less than 2 candidates, we can't do any
- * bonding and prefer the original router. */
-
- if (primary_orig_node->bond.candidates < 2)
- return orig_node->router;
-
-
- /* all nodes between should choose a candidate which
- * is is not on the interface where the packet came
- * in. */
- first_candidate = primary_orig_node->bond.selected;
- router = first_candidate;
-
- if (bonding_enabled) {
- /* in the bonding case, send the packets in a round
- * robin fashion over the remaining interfaces. */
- do {
- /* recv_if == NULL on the first node. */
- if (router->if_incoming != recv_if)
- break;
-
- router = router->next_bond_candidate;
- } while (router != first_candidate);
-
- primary_orig_node->bond.selected = router->next_bond_candidate;
-
- } else {
- /* if bonding is disabled, use the best of the
- * remaining candidates which are not using
- * this interface. */
- best_router = first_candidate;
-
- do {
- /* recv_if == NULL on the first node. */
- if ((router->if_incoming != recv_if) &&
- (router->tq_avg > best_router->tq_avg))
- best_router = router;
-
- router = router->next_bond_candidate;
- } while (router != first_candidate);
-
- router = best_router;
- }
-
- return router;
-}
-
-static int check_unicast_packet(struct sk_buff *skb, int hdr_size)
-{
- struct ethhdr *ethhdr;
-
- /* drop packet if it has not necessary minimum size */
- if (unlikely(!pskb_may_pull(skb, hdr_size)))
- return -1;
-
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* packet with unicast indication but broadcast recipient */
- if (is_broadcast_ether_addr(ethhdr->h_dest))
- return -1;
-
- /* packet with broadcast sender address */
- if (is_broadcast_ether_addr(ethhdr->h_source))
- return -1;
-
- /* not for me */
- if (!is_my_mac(ethhdr->h_dest))
- return -1;
-
- return 0;
-}
-
-int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if,
- int hdr_size)
-{
- struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
- struct orig_node *orig_node;
- struct neigh_node *router;
- struct batman_if *batman_if;
- uint8_t dstaddr[ETH_ALEN];
- struct unicast_packet *unicast_packet;
- struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
- int ret;
- struct sk_buff *new_skb;
-
- unicast_packet = (struct unicast_packet *)skb->data;
-
- /* TTL exceeded */
- if (unicast_packet->ttl < 2) {
- pr_debug("Warning - can't forward unicast packet from %pM to "
- "%pM: ttl exceeded\n", ethhdr->h_source,
- unicast_packet->dest);
- return NET_RX_DROP;
- }
-
- /* get routing information */
- spin_lock_bh(&bat_priv->orig_hash_lock);
- orig_node = ((struct orig_node *)
- hash_find(bat_priv->orig_hash, compare_orig, choose_orig,
- unicast_packet->dest));
-
- router = find_router(bat_priv, orig_node, recv_if);
-
- if (!router) {
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return NET_RX_DROP;
- }
-
- /* don't lock while sending the packets ... we therefore
- * copy the required data before sending */
-
- batman_if = router->if_incoming;
- memcpy(dstaddr, router->addr, ETH_ALEN);
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- /* create a copy of the skb, if needed, to modify it. */
- if (skb_cow(skb, sizeof(struct ethhdr)) < 0)
- return NET_RX_DROP;
-
- unicast_packet = (struct unicast_packet *)skb->data;
-
- if (unicast_packet->packet_type == BAT_UNICAST &&
- atomic_read(&bat_priv->fragmentation) &&
- skb->len > batman_if->net_dev->mtu)
- return frag_send_skb(skb, bat_priv, batman_if,
- dstaddr);
-
- if (unicast_packet->packet_type == BAT_UNICAST_FRAG &&
- 2 * skb->len - hdr_size <= batman_if->net_dev->mtu) {
-
- ret = frag_reassemble_skb(skb, bat_priv, &new_skb);
-
- if (ret == NET_RX_DROP)
- return NET_RX_DROP;
-
- /* packet was buffered for late merge */
- if (!new_skb)
- return NET_RX_SUCCESS;
-
- skb = new_skb;
- unicast_packet = (struct unicast_packet *)skb->data;
- }
-
- /* decrement ttl */
- unicast_packet->ttl--;
-
- /* route it */
- send_skb_packet(skb, batman_if, dstaddr);
-
- return NET_RX_SUCCESS;
-}
-
-int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
- struct unicast_packet *unicast_packet;
- int hdr_size = sizeof(struct unicast_packet);
-
- if (check_unicast_packet(skb, hdr_size) < 0)
- return NET_RX_DROP;
-
- unicast_packet = (struct unicast_packet *)skb->data;
-
- /* packet for me */
- if (is_my_mac(unicast_packet->dest)) {
- interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
- return NET_RX_SUCCESS;
- }
-
- return route_unicast_packet(skb, recv_if, hdr_size);
-}
-
-int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
- struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
- struct unicast_frag_packet *unicast_packet;
- int hdr_size = sizeof(struct unicast_frag_packet);
- struct sk_buff *new_skb = NULL;
- int ret;
-
- if (check_unicast_packet(skb, hdr_size) < 0)
- return NET_RX_DROP;
-
- unicast_packet = (struct unicast_frag_packet *)skb->data;
-
- /* packet for me */
- if (is_my_mac(unicast_packet->dest)) {
-
- ret = frag_reassemble_skb(skb, bat_priv, &new_skb);
-
- if (ret == NET_RX_DROP)
- return NET_RX_DROP;
-
- /* packet was buffered for late merge */
- if (!new_skb)
- return NET_RX_SUCCESS;
-
- interface_rx(recv_if->soft_iface, new_skb, recv_if,
- sizeof(struct unicast_packet));
- return NET_RX_SUCCESS;
- }
-
- return route_unicast_packet(skb, recv_if, hdr_size);
-}
-
-
-int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
- struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
- struct orig_node *orig_node;
- struct bcast_packet *bcast_packet;
- struct ethhdr *ethhdr;
- int hdr_size = sizeof(struct bcast_packet);
- int32_t seq_diff;
-
- /* drop packet if it has not necessary minimum size */
- if (unlikely(!pskb_may_pull(skb, hdr_size)))
- return NET_RX_DROP;
-
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* packet with broadcast indication but unicast recipient */
- if (!is_broadcast_ether_addr(ethhdr->h_dest))
- return NET_RX_DROP;
-
- /* packet with broadcast sender address */
- if (is_broadcast_ether_addr(ethhdr->h_source))
- return NET_RX_DROP;
-
- /* ignore broadcasts sent by myself */
- if (is_my_mac(ethhdr->h_source))
- return NET_RX_DROP;
-
- bcast_packet = (struct bcast_packet *)skb->data;
-
- /* ignore broadcasts originated by myself */
- if (is_my_mac(bcast_packet->orig))
- return NET_RX_DROP;
-
- if (bcast_packet->ttl < 2)
- return NET_RX_DROP;
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- orig_node = ((struct orig_node *)
- hash_find(bat_priv->orig_hash, compare_orig, choose_orig,
- bcast_packet->orig));
-
- if (orig_node == NULL) {
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return NET_RX_DROP;
- }
-
- /* check whether the packet is a duplicate */
- if (get_bit_status(orig_node->bcast_bits,
- orig_node->last_bcast_seqno,
- ntohl(bcast_packet->seqno))) {
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return NET_RX_DROP;
- }
-
- seq_diff = ntohl(bcast_packet->seqno) - orig_node->last_bcast_seqno;
-
- /* check whether the packet is old and the host just restarted. */
- if (window_protected(bat_priv, seq_diff,
- &orig_node->bcast_seqno_reset)) {
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return NET_RX_DROP;
- }
-
- /* mark broadcast in flood history, update window position
- * if required. */
- if (bit_get_packet(bat_priv, orig_node->bcast_bits, seq_diff, 1))
- orig_node->last_bcast_seqno = ntohl(bcast_packet->seqno);
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- /* rebroadcast packet */
- add_bcast_packet_to_list(bat_priv, skb);
-
- /* broadcast for me */
- interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
-
- return NET_RX_SUCCESS;
-}
-
-int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if)
-{
- struct vis_packet *vis_packet;
- struct ethhdr *ethhdr;
- struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
- int hdr_size = sizeof(struct vis_packet);
-
- /* keep skb linear */
- if (skb_linearize(skb) < 0)
- return NET_RX_DROP;
-
- if (unlikely(!pskb_may_pull(skb, hdr_size)))
- return NET_RX_DROP;
-
- vis_packet = (struct vis_packet *)skb->data;
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- /* not for me */
- if (!is_my_mac(ethhdr->h_dest))
- return NET_RX_DROP;
-
- /* ignore own packets */
- if (is_my_mac(vis_packet->vis_orig))
- return NET_RX_DROP;
-
- if (is_my_mac(vis_packet->sender_orig))
- return NET_RX_DROP;
-
- switch (vis_packet->vis_type) {
- case VIS_TYPE_SERVER_SYNC:
- receive_server_sync_packet(bat_priv, vis_packet,
- skb_headlen(skb));
- break;
-
- case VIS_TYPE_CLIENT_UPDATE:
- receive_client_update_packet(bat_priv, vis_packet,
- skb_headlen(skb));
- break;
-
- default: /* ignore unknown packet */
- break;
- }
-
- /* We take a copy of the data in the packet, so we should
- always free the skbuf. */
- return NET_RX_DROP;
-}
diff --git a/drivers/staging/batman-adv/routing.h b/drivers/staging/batman-adv/routing.h
deleted file mode 100644
index f108f23..0000000
--- a/drivers/staging/batman-adv/routing.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_ROUTING_H_
-#define _NET_BATMAN_ADV_ROUTING_H_
-
-#include "types.h"
-
-void slide_own_bcast_window(struct batman_if *batman_if);
-void receive_bat_packet(struct ethhdr *ethhdr,
- struct batman_packet *batman_packet,
- unsigned char *hna_buff, int hna_buff_len,
- struct batman_if *if_incoming);
-void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
- struct neigh_node *neigh_node, unsigned char *hna_buff,
- int hna_buff_len);
-int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if,
- int hdr_size);
-int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if);
-int recv_bat_packet(struct sk_buff *skb, struct batman_if *recv_if);
-struct neigh_node *find_router(struct bat_priv *bat_priv,
- struct orig_node *orig_node, struct batman_if *recv_if);
-void update_bonding_candidates(struct bat_priv *bat_priv,
- struct orig_node *orig_node);
-
-#endif /* _NET_BATMAN_ADV_ROUTING_H_ */
diff --git a/drivers/staging/batman-adv/send.c b/drivers/staging/batman-adv/send.c
deleted file mode 100644
index b89b9f7..0000000
--- a/drivers/staging/batman-adv/send.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "send.h"
-#include "routing.h"
-#include "translation-table.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "types.h"
-#include "vis.h"
-#include "aggregation.h"
-#include "gateway_common.h"
-#include "originator.h"
-
-static void send_outstanding_bcast_packet(struct work_struct *work);
-
-/* apply hop penalty for a normal link */
-static uint8_t hop_penalty(const uint8_t tq, struct bat_priv *bat_priv)
-{
- int hop_penalty = atomic_read(&bat_priv->hop_penalty);
- return (tq * (TQ_MAX_VALUE - hop_penalty)) / (TQ_MAX_VALUE);
-}
-
-/* when do we schedule our own packet to be sent */
-static unsigned long own_send_time(struct bat_priv *bat_priv)
-{
- return jiffies + msecs_to_jiffies(
- atomic_read(&bat_priv->orig_interval) -
- JITTER + (random32() % 2*JITTER));
-}
-
-/* when do we schedule a forwarded packet to be sent */
-static unsigned long forward_send_time(struct bat_priv *bat_priv)
-{
- return jiffies + msecs_to_jiffies(random32() % (JITTER/2));
-}
-
-/* send out an already prepared packet to the given address via the
- * specified batman interface */
-int send_skb_packet(struct sk_buff *skb,
- struct batman_if *batman_if,
- uint8_t *dst_addr)
-{
- struct ethhdr *ethhdr;
-
- if (batman_if->if_status != IF_ACTIVE)
- goto send_skb_err;
-
- if (unlikely(!batman_if->net_dev))
- goto send_skb_err;
-
- if (!(batman_if->net_dev->flags & IFF_UP)) {
- pr_warning("Interface %s is not up - can't send packet via "
- "that interface!\n", batman_if->net_dev->name);
- goto send_skb_err;
- }
-
- /* push to the ethernet header. */
- if (my_skb_head_push(skb, sizeof(struct ethhdr)) < 0)
- goto send_skb_err;
-
- skb_reset_mac_header(skb);
-
- ethhdr = (struct ethhdr *) skb_mac_header(skb);
- memcpy(ethhdr->h_source, batman_if->net_dev->dev_addr, ETH_ALEN);
- memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN);
- ethhdr->h_proto = __constant_htons(ETH_P_BATMAN);
-
- skb_set_network_header(skb, ETH_HLEN);
- skb->priority = TC_PRIO_CONTROL;
- skb->protocol = __constant_htons(ETH_P_BATMAN);
-
- skb->dev = batman_if->net_dev;
-
- /* dev_queue_xmit() returns a negative result on error. However on
- * congestion and traffic shaping, it drops and returns NET_XMIT_DROP
- * (which is > 0). This will not be treated as an error. */
-
- return dev_queue_xmit(skb);
-send_skb_err:
- kfree_skb(skb);
- return NET_XMIT_DROP;
-}
-
-/* Send a packet to a given interface */
-static void send_packet_to_if(struct forw_packet *forw_packet,
- struct batman_if *batman_if)
-{
- struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
- char *fwd_str;
- uint8_t packet_num;
- int16_t buff_pos;
- struct batman_packet *batman_packet;
- struct sk_buff *skb;
-
- if (batman_if->if_status != IF_ACTIVE)
- return;
-
- packet_num = 0;
- buff_pos = 0;
- batman_packet = (struct batman_packet *)forw_packet->skb->data;
-
- /* adjust all flags and log packets */
- while (aggregated_packet(buff_pos,
- forw_packet->packet_len,
- batman_packet->num_hna)) {
-
- /* we might have aggregated direct link packets with an
- * ordinary base packet */
- if ((forw_packet->direct_link_flags & (1 << packet_num)) &&
- (forw_packet->if_incoming == batman_if))
- batman_packet->flags |= DIRECTLINK;
- else
- batman_packet->flags &= ~DIRECTLINK;
-
- fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ?
- "Sending own" :
- "Forwarding"));
- bat_dbg(DBG_BATMAN, bat_priv,
- "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d,"
- " IDF %s) on interface %s [%pM]\n",
- fwd_str, (packet_num > 0 ? "aggregated " : ""),
- batman_packet->orig, ntohl(batman_packet->seqno),
- batman_packet->tq, batman_packet->ttl,
- (batman_packet->flags & DIRECTLINK ?
- "on" : "off"),
- batman_if->net_dev->name, batman_if->net_dev->dev_addr);
-
- buff_pos += sizeof(struct batman_packet) +
- (batman_packet->num_hna * ETH_ALEN);
- packet_num++;
- batman_packet = (struct batman_packet *)
- (forw_packet->skb->data + buff_pos);
- }
-
- /* create clone because function is called more than once */
- skb = skb_clone(forw_packet->skb, GFP_ATOMIC);
- if (skb)
- send_skb_packet(skb, batman_if, broadcast_addr);
-}
-
-/* send a batman packet */
-static void send_packet(struct forw_packet *forw_packet)
-{
- struct batman_if *batman_if;
- struct net_device *soft_iface;
- struct bat_priv *bat_priv;
- struct batman_packet *batman_packet =
- (struct batman_packet *)(forw_packet->skb->data);
- unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0);
-
- if (!forw_packet->if_incoming) {
- pr_err("Error - can't forward packet: incoming iface not "
- "specified\n");
- return;
- }
-
- soft_iface = forw_packet->if_incoming->soft_iface;
- bat_priv = netdev_priv(soft_iface);
-
- if (forw_packet->if_incoming->if_status != IF_ACTIVE)
- return;
-
- /* multihomed peer assumed */
- /* non-primary OGMs are only broadcasted on their interface */
- if ((directlink && (batman_packet->ttl == 1)) ||
- (forw_packet->own && (forw_packet->if_incoming->if_num > 0))) {
-
- /* FIXME: what about aggregated packets ? */
- bat_dbg(DBG_BATMAN, bat_priv,
- "%s packet (originator %pM, seqno %d, TTL %d) "
- "on interface %s [%pM]\n",
- (forw_packet->own ? "Sending own" : "Forwarding"),
- batman_packet->orig, ntohl(batman_packet->seqno),
- batman_packet->ttl,
- forw_packet->if_incoming->net_dev->name,
- forw_packet->if_incoming->net_dev->dev_addr);
-
- /* skb is only used once and than forw_packet is free'd */
- send_skb_packet(forw_packet->skb, forw_packet->if_incoming,
- broadcast_addr);
- forw_packet->skb = NULL;
-
- return;
- }
-
- /* broadcast on every interface */
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if (batman_if->soft_iface != soft_iface)
- continue;
-
- send_packet_to_if(forw_packet, batman_if);
- }
- rcu_read_unlock();
-}
-
-static void rebuild_batman_packet(struct bat_priv *bat_priv,
- struct batman_if *batman_if)
-{
- int new_len;
- unsigned char *new_buff;
- struct batman_packet *batman_packet;
-
- new_len = sizeof(struct batman_packet) +
- (bat_priv->num_local_hna * ETH_ALEN);
- new_buff = kmalloc(new_len, GFP_ATOMIC);
-
- /* keep old buffer if kmalloc should fail */
- if (new_buff) {
- memcpy(new_buff, batman_if->packet_buff,
- sizeof(struct batman_packet));
- batman_packet = (struct batman_packet *)new_buff;
-
- batman_packet->num_hna = hna_local_fill_buffer(bat_priv,
- new_buff + sizeof(struct batman_packet),
- new_len - sizeof(struct batman_packet));
-
- kfree(batman_if->packet_buff);
- batman_if->packet_buff = new_buff;
- batman_if->packet_len = new_len;
- }
-}
-
-void schedule_own_packet(struct batman_if *batman_if)
-{
- struct bat_priv *bat_priv = netdev_priv(batman_if->soft_iface);
- unsigned long send_time;
- struct batman_packet *batman_packet;
- int vis_server;
-
- if ((batman_if->if_status == IF_NOT_IN_USE) ||
- (batman_if->if_status == IF_TO_BE_REMOVED))
- return;
-
- vis_server = atomic_read(&bat_priv->vis_mode);
-
- /**
- * the interface gets activated here to avoid race conditions between
- * the moment of activating the interface in
- * hardif_activate_interface() where the originator mac is set and
- * outdated packets (especially uninitialized mac addresses) in the
- * packet queue
- */
- if (batman_if->if_status == IF_TO_BE_ACTIVATED)
- batman_if->if_status = IF_ACTIVE;
-
- /* if local hna has changed and interface is a primary interface */
- if ((atomic_read(&bat_priv->hna_local_changed)) &&
- (batman_if == bat_priv->primary_if))
- rebuild_batman_packet(bat_priv, batman_if);
-
- /**
- * NOTE: packet_buff might just have been re-allocated in
- * rebuild_batman_packet()
- */
- batman_packet = (struct batman_packet *)batman_if->packet_buff;
-
- /* change sequence number to network order */
- batman_packet->seqno =
- htonl((uint32_t)atomic_read(&batman_if->seqno));
-
- if (vis_server == VIS_TYPE_SERVER_SYNC)
- batman_packet->flags |= VIS_SERVER;
- else
- batman_packet->flags &= ~VIS_SERVER;
-
- if ((batman_if == bat_priv->primary_if) &&
- (atomic_read(&bat_priv->gw_mode) == GW_MODE_SERVER))
- batman_packet->gw_flags =
- (uint8_t)atomic_read(&bat_priv->gw_bandwidth);
- else
- batman_packet->gw_flags = 0;
-
- atomic_inc(&batman_if->seqno);
-
- slide_own_bcast_window(batman_if);
- send_time = own_send_time(bat_priv);
- add_bat_packet_to_list(bat_priv,
- batman_if->packet_buff,
- batman_if->packet_len,
- batman_if, 1, send_time);
-}
-
-void schedule_forward_packet(struct orig_node *orig_node,
- struct ethhdr *ethhdr,
- struct batman_packet *batman_packet,
- uint8_t directlink, int hna_buff_len,
- struct batman_if *if_incoming)
-{
- struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
- unsigned char in_tq, in_ttl, tq_avg = 0;
- unsigned long send_time;
-
- if (batman_packet->ttl <= 1) {
- bat_dbg(DBG_BATMAN, bat_priv, "ttl exceeded\n");
- return;
- }
-
- in_tq = batman_packet->tq;
- in_ttl = batman_packet->ttl;
-
- batman_packet->ttl--;
- memcpy(batman_packet->prev_sender, ethhdr->h_source, ETH_ALEN);
-
- /* rebroadcast tq of our best ranking neighbor to ensure the rebroadcast
- * of our best tq value */
- if ((orig_node->router) && (orig_node->router->tq_avg != 0)) {
-
- /* rebroadcast ogm of best ranking neighbor as is */
- if (!compare_orig(orig_node->router->addr, ethhdr->h_source)) {
- batman_packet->tq = orig_node->router->tq_avg;
-
- if (orig_node->router->last_ttl)
- batman_packet->ttl = orig_node->router->last_ttl
- - 1;
- }
-
- tq_avg = orig_node->router->tq_avg;
- }
-
- /* apply hop penalty */
- batman_packet->tq = hop_penalty(batman_packet->tq, bat_priv);
-
- bat_dbg(DBG_BATMAN, bat_priv,
- "Forwarding packet: tq_orig: %i, tq_avg: %i, "
- "tq_forw: %i, ttl_orig: %i, ttl_forw: %i\n",
- in_tq, tq_avg, batman_packet->tq, in_ttl - 1,
- batman_packet->ttl);
-
- batman_packet->seqno = htonl(batman_packet->seqno);
-
- /* switch of primaries first hop flag when forwarding */
- batman_packet->flags &= ~PRIMARIES_FIRST_HOP;
- if (directlink)
- batman_packet->flags |= DIRECTLINK;
- else
- batman_packet->flags &= ~DIRECTLINK;
-
- send_time = forward_send_time(bat_priv);
- add_bat_packet_to_list(bat_priv,
- (unsigned char *)batman_packet,
- sizeof(struct batman_packet) + hna_buff_len,
- if_incoming, 0, send_time);
-}
-
-static void forw_packet_free(struct forw_packet *forw_packet)
-{
- if (forw_packet->skb)
- kfree_skb(forw_packet->skb);
- kfree(forw_packet);
-}
-
-static void _add_bcast_packet_to_list(struct bat_priv *bat_priv,
- struct forw_packet *forw_packet,
- unsigned long send_time)
-{
- INIT_HLIST_NODE(&forw_packet->list);
-
- /* add new packet to packet list */
- spin_lock_bh(&bat_priv->forw_bcast_list_lock);
- hlist_add_head(&forw_packet->list, &bat_priv->forw_bcast_list);
- spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
-
- /* start timer for this packet */
- INIT_DELAYED_WORK(&forw_packet->delayed_work,
- send_outstanding_bcast_packet);
- queue_delayed_work(bat_event_workqueue, &forw_packet->delayed_work,
- send_time);
-}
-
-#define atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0)
-/* add a broadcast packet to the queue and setup timers. broadcast packets
- * are sent multiple times to increase probability for beeing received.
- *
- * This function returns NETDEV_TX_OK on success and NETDEV_TX_BUSY on
- * errors.
- *
- * The skb is not consumed, so the caller should make sure that the
- * skb is freed. */
-int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb)
-{
- struct forw_packet *forw_packet;
- struct bcast_packet *bcast_packet;
-
- if (!atomic_dec_not_zero(&bat_priv->bcast_queue_left)) {
- bat_dbg(DBG_BATMAN, bat_priv, "bcast packet queue full\n");
- goto out;
- }
-
- if (!bat_priv->primary_if)
- goto out;
-
- forw_packet = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC);
-
- if (!forw_packet)
- goto out_and_inc;
-
- skb = skb_copy(skb, GFP_ATOMIC);
- if (!skb)
- goto packet_free;
-
- /* as we have a copy now, it is safe to decrease the TTL */
- bcast_packet = (struct bcast_packet *)skb->data;
- bcast_packet->ttl--;
-
- skb_reset_mac_header(skb);
-
- forw_packet->skb = skb;
- forw_packet->if_incoming = bat_priv->primary_if;
-
- /* how often did we send the bcast packet ? */
- forw_packet->num_packets = 0;
-
- _add_bcast_packet_to_list(bat_priv, forw_packet, 1);
- return NETDEV_TX_OK;
-
-packet_free:
- kfree(forw_packet);
-out_and_inc:
- atomic_inc(&bat_priv->bcast_queue_left);
-out:
- return NETDEV_TX_BUSY;
-}
-
-static void send_outstanding_bcast_packet(struct work_struct *work)
-{
- struct batman_if *batman_if;
- struct delayed_work *delayed_work =
- container_of(work, struct delayed_work, work);
- struct forw_packet *forw_packet =
- container_of(delayed_work, struct forw_packet, delayed_work);
- struct sk_buff *skb1;
- struct net_device *soft_iface = forw_packet->if_incoming->soft_iface;
- struct bat_priv *bat_priv = netdev_priv(soft_iface);
-
- spin_lock_bh(&bat_priv->forw_bcast_list_lock);
- hlist_del(&forw_packet->list);
- spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
-
- if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
- goto out;
-
- /* rebroadcast packet */
- rcu_read_lock();
- list_for_each_entry_rcu(batman_if, &if_list, list) {
- if (batman_if->soft_iface != soft_iface)
- continue;
-
- /* send a copy of the saved skb */
- skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
- if (skb1)
- send_skb_packet(skb1, batman_if, broadcast_addr);
- }
- rcu_read_unlock();
-
- forw_packet->num_packets++;
-
- /* if we still have some more bcasts to send */
- if (forw_packet->num_packets < 3) {
- _add_bcast_packet_to_list(bat_priv, forw_packet,
- ((5 * HZ) / 1000));
- return;
- }
-
-out:
- forw_packet_free(forw_packet);
- atomic_inc(&bat_priv->bcast_queue_left);
-}
-
-void send_outstanding_bat_packet(struct work_struct *work)
-{
- struct delayed_work *delayed_work =
- container_of(work, struct delayed_work, work);
- struct forw_packet *forw_packet =
- container_of(delayed_work, struct forw_packet, delayed_work);
- struct bat_priv *bat_priv;
-
- bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface);
- spin_lock_bh(&bat_priv->forw_bat_list_lock);
- hlist_del(&forw_packet->list);
- spin_unlock_bh(&bat_priv->forw_bat_list_lock);
-
- if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
- goto out;
-
- send_packet(forw_packet);
-
- /**
- * we have to have at least one packet in the queue
- * to determine the queues wake up time unless we are
- * shutting down
- */
- if (forw_packet->own)
- schedule_own_packet(forw_packet->if_incoming);
-
-out:
- /* don't count own packet */
- if (!forw_packet->own)
- atomic_inc(&bat_priv->batman_queue_left);
-
- forw_packet_free(forw_packet);
-}
-
-void purge_outstanding_packets(struct bat_priv *bat_priv,
- struct batman_if *batman_if)
-{
- struct forw_packet *forw_packet;
- struct hlist_node *tmp_node, *safe_tmp_node;
-
- if (batman_if)
- bat_dbg(DBG_BATMAN, bat_priv,
- "purge_outstanding_packets(): %s\n",
- batman_if->net_dev->name);
- else
- bat_dbg(DBG_BATMAN, bat_priv,
- "purge_outstanding_packets()\n");
-
- /* free bcast list */
- spin_lock_bh(&bat_priv->forw_bcast_list_lock);
- hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
- &bat_priv->forw_bcast_list, list) {
-
- /**
- * if purge_outstanding_packets() was called with an argmument
- * we delete only packets belonging to the given interface
- */
- if ((batman_if) &&
- (forw_packet->if_incoming != batman_if))
- continue;
-
- spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
-
- /**
- * send_outstanding_bcast_packet() will lock the list to
- * delete the item from the list
- */
- cancel_delayed_work_sync(&forw_packet->delayed_work);
- spin_lock_bh(&bat_priv->forw_bcast_list_lock);
- }
- spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
-
- /* free batman packet list */
- spin_lock_bh(&bat_priv->forw_bat_list_lock);
- hlist_for_each_entry_safe(forw_packet, tmp_node, safe_tmp_node,
- &bat_priv->forw_bat_list, list) {
-
- /**
- * if purge_outstanding_packets() was called with an argmument
- * we delete only packets belonging to the given interface
- */
- if ((batman_if) &&
- (forw_packet->if_incoming != batman_if))
- continue;
-
- spin_unlock_bh(&bat_priv->forw_bat_list_lock);
-
- /**
- * send_outstanding_bat_packet() will lock the list to
- * delete the item from the list
- */
- cancel_delayed_work_sync(&forw_packet->delayed_work);
- spin_lock_bh(&bat_priv->forw_bat_list_lock);
- }
- spin_unlock_bh(&bat_priv->forw_bat_list_lock);
-}
diff --git a/drivers/staging/batman-adv/send.h b/drivers/staging/batman-adv/send.h
deleted file mode 100644
index c4cefa8..0000000
--- a/drivers/staging/batman-adv/send.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_SEND_H_
-#define _NET_BATMAN_ADV_SEND_H_
-
-#include "types.h"
-
-int send_skb_packet(struct sk_buff *skb,
- struct batman_if *batman_if,
- uint8_t *dst_addr);
-void schedule_own_packet(struct batman_if *batman_if);
-void schedule_forward_packet(struct orig_node *orig_node,
- struct ethhdr *ethhdr,
- struct batman_packet *batman_packet,
- uint8_t directlink, int hna_buff_len,
- struct batman_if *if_outgoing);
-int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb);
-void send_outstanding_bat_packet(struct work_struct *work);
-void purge_outstanding_packets(struct bat_priv *bat_priv,
- struct batman_if *batman_if);
-
-#endif /* _NET_BATMAN_ADV_SEND_H_ */
diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c
deleted file mode 100644
index e89ede1..0000000
--- a/drivers/staging/batman-adv/soft-interface.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "routing.h"
-#include "send.h"
-#include "bat_debugfs.h"
-#include "translation-table.h"
-#include "types.h"
-#include "hash.h"
-#include "gateway_common.h"
-#include "gateway_client.h"
-#include "send.h"
-#include "bat_sysfs.h"
-#include <linux/slab.h>
-#include <linux/ethtool.h>
-#include <linux/etherdevice.h>
-#include <linux/if_vlan.h>
-#include "unicast.h"
-#include "routing.h"
-
-
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd);
-static void bat_get_drvinfo(struct net_device *dev,
- struct ethtool_drvinfo *info);
-static u32 bat_get_msglevel(struct net_device *dev);
-static void bat_set_msglevel(struct net_device *dev, u32 value);
-static u32 bat_get_link(struct net_device *dev);
-static u32 bat_get_rx_csum(struct net_device *dev);
-static int bat_set_rx_csum(struct net_device *dev, u32 data);
-
-static const struct ethtool_ops bat_ethtool_ops = {
- .get_settings = bat_get_settings,
- .get_drvinfo = bat_get_drvinfo,
- .get_msglevel = bat_get_msglevel,
- .set_msglevel = bat_set_msglevel,
- .get_link = bat_get_link,
- .get_rx_csum = bat_get_rx_csum,
- .set_rx_csum = bat_set_rx_csum
-};
-
-int my_skb_head_push(struct sk_buff *skb, unsigned int len)
-{
- int result;
-
- /**
- * TODO: We must check if we can release all references to non-payload
- * data using skb_header_release in our skbs to allow skb_cow_header to
- * work optimally. This means that those skbs are not allowed to read
- * or write any data which is before the current position of skb->data
- * after that call and thus allow other skbs with the same data buffer
- * to write freely in that area.
- */
- result = skb_cow_head(skb, len);
- if (result < 0)
- return result;
-
- skb_push(skb, len);
- return 0;
-}
-
-static void softif_neigh_free_ref(struct kref *refcount)
-{
- struct softif_neigh *softif_neigh;
-
- softif_neigh = container_of(refcount, struct softif_neigh, refcount);
- kfree(softif_neigh);
-}
-
-static void softif_neigh_free_rcu(struct rcu_head *rcu)
-{
- struct softif_neigh *softif_neigh;
-
- softif_neigh = container_of(rcu, struct softif_neigh, rcu);
- kref_put(&softif_neigh->refcount, softif_neigh_free_ref);
-}
-
-void softif_neigh_purge(struct bat_priv *bat_priv)
-{
- struct softif_neigh *softif_neigh, *softif_neigh_tmp;
- struct hlist_node *node, *node_tmp;
-
- spin_lock_bh(&bat_priv->softif_neigh_lock);
-
- hlist_for_each_entry_safe(softif_neigh, node, node_tmp,
- &bat_priv->softif_neigh_list, list) {
-
- if ((!time_after(jiffies, softif_neigh->last_seen +
- msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) &&
- (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))
- continue;
-
- hlist_del_rcu(&softif_neigh->list);
-
- if (bat_priv->softif_neigh == softif_neigh) {
- bat_dbg(DBG_ROUTES, bat_priv,
- "Current mesh exit point '%pM' vanished "
- "(vid: %d).\n",
- softif_neigh->addr, softif_neigh->vid);
- softif_neigh_tmp = bat_priv->softif_neigh;
- bat_priv->softif_neigh = NULL;
- kref_put(&softif_neigh_tmp->refcount,
- softif_neigh_free_ref);
- }
-
- call_rcu(&softif_neigh->rcu, softif_neigh_free_rcu);
- }
-
- spin_unlock_bh(&bat_priv->softif_neigh_lock);
-}
-
-static struct softif_neigh *softif_neigh_get(struct bat_priv *bat_priv,
- uint8_t *addr, short vid)
-{
- struct softif_neigh *softif_neigh;
- struct hlist_node *node;
-
- rcu_read_lock();
- hlist_for_each_entry_rcu(softif_neigh, node,
- &bat_priv->softif_neigh_list, list) {
- if (memcmp(softif_neigh->addr, addr, ETH_ALEN) != 0)
- continue;
-
- if (softif_neigh->vid != vid)
- continue;
-
- softif_neigh->last_seen = jiffies;
- goto found;
- }
-
- softif_neigh = kzalloc(sizeof(struct softif_neigh), GFP_ATOMIC);
- if (!softif_neigh)
- goto out;
-
- memcpy(softif_neigh->addr, addr, ETH_ALEN);
- softif_neigh->vid = vid;
- softif_neigh->last_seen = jiffies;
- kref_init(&softif_neigh->refcount);
-
- INIT_HLIST_NODE(&softif_neigh->list);
- spin_lock_bh(&bat_priv->softif_neigh_lock);
- hlist_add_head_rcu(&softif_neigh->list, &bat_priv->softif_neigh_list);
- spin_unlock_bh(&bat_priv->softif_neigh_lock);
-
-found:
- kref_get(&softif_neigh->refcount);
-out:
- rcu_read_unlock();
- return softif_neigh;
-}
-
-int softif_neigh_seq_print_text(struct seq_file *seq, void *offset)
-{
- struct net_device *net_dev = (struct net_device *)seq->private;
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- struct softif_neigh *softif_neigh;
- struct hlist_node *node;
- size_t buf_size, pos;
- char *buff;
-
- if (!bat_priv->primary_if) {
- return seq_printf(seq, "BATMAN mesh %s disabled - "
- "please specify interfaces to enable it\n",
- net_dev->name);
- }
-
- seq_printf(seq, "Softif neighbor list (%s)\n", net_dev->name);
-
- buf_size = 1;
- /* Estimate length for: " xx:xx:xx:xx:xx:xx\n" */
- rcu_read_lock();
- hlist_for_each_entry_rcu(softif_neigh, node,
- &bat_priv->softif_neigh_list, list)
- buf_size += 30;
- rcu_read_unlock();
-
- buff = kmalloc(buf_size, GFP_ATOMIC);
- if (!buff)
- return -ENOMEM;
-
- buff[0] = '\0';
- pos = 0;
-
- rcu_read_lock();
- hlist_for_each_entry_rcu(softif_neigh, node,
- &bat_priv->softif_neigh_list, list) {
- pos += snprintf(buff + pos, 31, "%s %pM (vid: %d)\n",
- bat_priv->softif_neigh == softif_neigh
- ? "=>" : " ", softif_neigh->addr,
- softif_neigh->vid);
- }
- rcu_read_unlock();
-
- seq_printf(seq, "%s", buff);
- kfree(buff);
- return 0;
-}
-
-static void softif_batman_recv(struct sk_buff *skb, struct net_device *dev,
- short vid)
-{
- struct bat_priv *bat_priv = netdev_priv(dev);
- struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
- struct batman_packet *batman_packet;
- struct softif_neigh *softif_neigh, *softif_neigh_tmp;
-
- if (ntohs(ethhdr->h_proto) == ETH_P_8021Q)
- batman_packet = (struct batman_packet *)
- (skb->data + ETH_HLEN + VLAN_HLEN);
- else
- batman_packet = (struct batman_packet *)(skb->data + ETH_HLEN);
-
- if (batman_packet->version != COMPAT_VERSION)
- goto err;
-
- if (batman_packet->packet_type != BAT_PACKET)
- goto err;
-
- if (!(batman_packet->flags & PRIMARIES_FIRST_HOP))
- goto err;
-
- if (is_my_mac(batman_packet->orig))
- goto err;
-
- softif_neigh = softif_neigh_get(bat_priv, batman_packet->orig, vid);
-
- if (!softif_neigh)
- goto err;
-
- if (bat_priv->softif_neigh == softif_neigh)
- goto out;
-
- /* we got a neighbor but its mac is 'bigger' than ours */
- if (memcmp(bat_priv->primary_if->net_dev->dev_addr,
- softif_neigh->addr, ETH_ALEN) < 0)
- goto out;
-
- /* switch to new 'smallest neighbor' */
- if ((bat_priv->softif_neigh) &&
- (memcmp(softif_neigh->addr, bat_priv->softif_neigh->addr,
- ETH_ALEN) < 0)) {
- bat_dbg(DBG_ROUTES, bat_priv,
- "Changing mesh exit point from %pM (vid: %d) "
- "to %pM (vid: %d).\n",
- bat_priv->softif_neigh->addr,
- bat_priv->softif_neigh->vid,
- softif_neigh->addr, softif_neigh->vid);
- softif_neigh_tmp = bat_priv->softif_neigh;
- bat_priv->softif_neigh = softif_neigh;
- kref_put(&softif_neigh_tmp->refcount, softif_neigh_free_ref);
- /* we need to hold the additional reference */
- goto err;
- }
-
- /* close own batX device and use softif_neigh as exit node */
- if ((!bat_priv->softif_neigh) &&
- (memcmp(softif_neigh->addr,
- bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN) < 0)) {
- bat_dbg(DBG_ROUTES, bat_priv,
- "Setting mesh exit point to %pM (vid: %d).\n",
- softif_neigh->addr, softif_neigh->vid);
- bat_priv->softif_neigh = softif_neigh;
- /* we need to hold the additional reference */
- goto err;
- }
-
-out:
- kref_put(&softif_neigh->refcount, softif_neigh_free_ref);
-err:
- kfree_skb(skb);
- return;
-}
-
-static int interface_open(struct net_device *dev)
-{
- netif_start_queue(dev);
- return 0;
-}
-
-static int interface_release(struct net_device *dev)
-{
- netif_stop_queue(dev);
- return 0;
-}
-
-static struct net_device_stats *interface_stats(struct net_device *dev)
-{
- struct bat_priv *bat_priv = netdev_priv(dev);
- return &bat_priv->stats;
-}
-
-static int interface_set_mac_addr(struct net_device *dev, void *p)
-{
- struct bat_priv *bat_priv = netdev_priv(dev);
- struct sockaddr *addr = p;
-
- if (!is_valid_ether_addr(addr->sa_data))
- return -EADDRNOTAVAIL;
-
- /* only modify hna-table if it has been initialised before */
- if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) {
- hna_local_remove(bat_priv, dev->dev_addr,
- "mac address changed");
- hna_local_add(dev, addr->sa_data);
- }
-
- memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
- return 0;
-}
-
-static int interface_change_mtu(struct net_device *dev, int new_mtu)
-{
- /* check ranges */
- if ((new_mtu < 68) || (new_mtu > hardif_min_mtu(dev)))
- return -EINVAL;
-
- dev->mtu = new_mtu;
-
- return 0;
-}
-
-int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
-{
- struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
- struct bat_priv *bat_priv = netdev_priv(soft_iface);
- struct bcast_packet *bcast_packet;
- struct vlan_ethhdr *vhdr;
- int data_len = skb->len, ret;
- short vid = -1;
- bool do_bcast = false;
-
- if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
- goto dropped;
-
- soft_iface->trans_start = jiffies;
-
- switch (ntohs(ethhdr->h_proto)) {
- case ETH_P_8021Q:
- vhdr = (struct vlan_ethhdr *)skb->data;
- vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
-
- if (ntohs(vhdr->h_vlan_encapsulated_proto) != ETH_P_BATMAN)
- break;
-
- /* fall through */
- case ETH_P_BATMAN:
- softif_batman_recv(skb, soft_iface, vid);
- goto end;
- }
-
- /**
- * if we have a another chosen mesh exit node in range
- * it will transport the packets to the mesh
- */
- if ((bat_priv->softif_neigh) && (bat_priv->softif_neigh->vid == vid))
- goto dropped;
-
- /* TODO: check this for locks */
- hna_local_add(soft_iface, ethhdr->h_source);
-
- if (is_multicast_ether_addr(ethhdr->h_dest)) {
- ret = gw_is_target(bat_priv, skb);
-
- if (ret < 0)
- goto dropped;
-
- if (ret == 0)
- do_bcast = true;
- }
-
- /* ethernet packet should be broadcasted */
- if (do_bcast) {
- if (!bat_priv->primary_if)
- goto dropped;
-
- if (my_skb_head_push(skb, sizeof(struct bcast_packet)) < 0)
- goto dropped;
-
- bcast_packet = (struct bcast_packet *)skb->data;
- bcast_packet->version = COMPAT_VERSION;
- bcast_packet->ttl = TTL;
-
- /* batman packet type: broadcast */
- bcast_packet->packet_type = BAT_BCAST;
-
- /* hw address of first interface is the orig mac because only
- * this mac is known throughout the mesh */
- memcpy(bcast_packet->orig,
- bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
-
- /* set broadcast sequence number */
- bcast_packet->seqno =
- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
-
- add_bcast_packet_to_list(bat_priv, skb);
-
- /* a copy is stored in the bcast list, therefore removing
- * the original skb. */
- kfree_skb(skb);
-
- /* unicast packet */
- } else {
- ret = unicast_send_skb(skb, bat_priv);
- if (ret != 0)
- goto dropped_freed;
- }
-
- bat_priv->stats.tx_packets++;
- bat_priv->stats.tx_bytes += data_len;
- goto end;
-
-dropped:
- kfree_skb(skb);
-dropped_freed:
- bat_priv->stats.tx_dropped++;
-end:
- return NETDEV_TX_OK;
-}
-
-void interface_rx(struct net_device *soft_iface,
- struct sk_buff *skb, struct batman_if *recv_if,
- int hdr_size)
-{
- struct bat_priv *bat_priv = netdev_priv(soft_iface);
- struct unicast_packet *unicast_packet;
- struct ethhdr *ethhdr;
- struct vlan_ethhdr *vhdr;
- short vid = -1;
- int ret;
-
- /* check if enough space is available for pulling, and pull */
- if (!pskb_may_pull(skb, hdr_size))
- goto dropped;
-
- skb_pull_rcsum(skb, hdr_size);
- skb_reset_mac_header(skb);
-
- ethhdr = (struct ethhdr *)skb_mac_header(skb);
-
- switch (ntohs(ethhdr->h_proto)) {
- case ETH_P_8021Q:
- vhdr = (struct vlan_ethhdr *)skb->data;
- vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
-
- if (ntohs(vhdr->h_vlan_encapsulated_proto) != ETH_P_BATMAN)
- break;
-
- /* fall through */
- case ETH_P_BATMAN:
- goto dropped;
- }
-
- /**
- * if we have a another chosen mesh exit node in range
- * it will transport the packets to the non-mesh network
- */
- if ((bat_priv->softif_neigh) && (bat_priv->softif_neigh->vid == vid)) {
- skb_push(skb, hdr_size);
- unicast_packet = (struct unicast_packet *)skb->data;
-
- if ((unicast_packet->packet_type != BAT_UNICAST) &&
- (unicast_packet->packet_type != BAT_UNICAST_FRAG))
- goto dropped;
-
- skb_reset_mac_header(skb);
-
- memcpy(unicast_packet->dest,
- bat_priv->softif_neigh->addr, ETH_ALEN);
- ret = route_unicast_packet(skb, recv_if, hdr_size);
- if (ret == NET_RX_DROP)
- goto dropped;
-
- goto out;
- }
-
- /* skb->dev & skb->pkt_type are set here */
- if (unlikely(!pskb_may_pull(skb, ETH_HLEN)))
- goto dropped;
- skb->protocol = eth_type_trans(skb, soft_iface);
-
- /* should not be neccesary anymore as we use skb_pull_rcsum()
- * TODO: please verify this and remove this TODO
- * -- Dec 21st 2009, Simon Wunderlich */
-
-/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/
-
- bat_priv->stats.rx_packets++;
- bat_priv->stats.rx_bytes += skb->len + sizeof(struct ethhdr);
-
- soft_iface->last_rx = jiffies;
-
- netif_rx(skb);
- return;
-
-dropped:
- kfree_skb(skb);
-out:
- return;
-}
-
-#ifdef HAVE_NET_DEVICE_OPS
-static const struct net_device_ops bat_netdev_ops = {
- .ndo_open = interface_open,
- .ndo_stop = interface_release,
- .ndo_get_stats = interface_stats,
- .ndo_set_mac_address = interface_set_mac_addr,
- .ndo_change_mtu = interface_change_mtu,
- .ndo_start_xmit = interface_tx,
- .ndo_validate_addr = eth_validate_addr
-};
-#endif
-
-static void interface_setup(struct net_device *dev)
-{
- struct bat_priv *priv = netdev_priv(dev);
- char dev_addr[ETH_ALEN];
-
- ether_setup(dev);
-
-#ifdef HAVE_NET_DEVICE_OPS
- dev->netdev_ops = &bat_netdev_ops;
-#else
- dev->open = interface_open;
- dev->stop = interface_release;
- dev->get_stats = interface_stats;
- dev->set_mac_address = interface_set_mac_addr;
- dev->change_mtu = interface_change_mtu;
- dev->hard_start_xmit = interface_tx;
-#endif
- dev->destructor = free_netdev;
-
- /**
- * can't call min_mtu, because the needed variables
- * have not been initialized yet
- */
- dev->mtu = ETH_DATA_LEN;
- dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the
- * skbuff for our header */
-
- /* generate random address */
- random_ether_addr(dev_addr);
- memcpy(dev->dev_addr, dev_addr, ETH_ALEN);
-
- SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);
-
- memset(priv, 0, sizeof(struct bat_priv));
-}
-
-struct net_device *softif_create(char *name)
-{
- struct net_device *soft_iface;
- struct bat_priv *bat_priv;
- int ret;
-
- soft_iface = alloc_netdev(sizeof(struct bat_priv) , name,
- interface_setup);
-
- if (!soft_iface) {
- pr_err("Unable to allocate the batman interface: %s\n", name);
- goto out;
- }
-
- ret = register_netdev(soft_iface);
- if (ret < 0) {
- pr_err("Unable to register the batman interface '%s': %i\n",
- name, ret);
- goto free_soft_iface;
- }
-
- bat_priv = netdev_priv(soft_iface);
-
- atomic_set(&bat_priv->aggregated_ogms, 1);
- atomic_set(&bat_priv->bonding, 0);
- atomic_set(&bat_priv->vis_mode, VIS_TYPE_CLIENT_UPDATE);
- atomic_set(&bat_priv->gw_mode, GW_MODE_OFF);
- atomic_set(&bat_priv->gw_sel_class, 20);
- atomic_set(&bat_priv->gw_bandwidth, 41);
- atomic_set(&bat_priv->orig_interval, 1000);
- atomic_set(&bat_priv->hop_penalty, 10);
- atomic_set(&bat_priv->log_level, 0);
- atomic_set(&bat_priv->fragmentation, 1);
- atomic_set(&bat_priv->bcast_queue_left, BCAST_QUEUE_LEN);
- atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
-
- atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
- atomic_set(&bat_priv->bcast_seqno, 1);
- atomic_set(&bat_priv->hna_local_changed, 0);
-
- bat_priv->primary_if = NULL;
- bat_priv->num_ifaces = 0;
- bat_priv->softif_neigh = NULL;
-
- ret = sysfs_add_meshif(soft_iface);
- if (ret < 0)
- goto unreg_soft_iface;
-
- ret = debugfs_add_meshif(soft_iface);
- if (ret < 0)
- goto unreg_sysfs;
-
- ret = mesh_init(soft_iface);
- if (ret < 0)
- goto unreg_debugfs;
-
- return soft_iface;
-
-unreg_debugfs:
- debugfs_del_meshif(soft_iface);
-unreg_sysfs:
- sysfs_del_meshif(soft_iface);
-unreg_soft_iface:
- unregister_netdev(soft_iface);
- return NULL;
-
-free_soft_iface:
- free_netdev(soft_iface);
-out:
- return NULL;
-}
-
-void softif_destroy(struct net_device *soft_iface)
-{
- debugfs_del_meshif(soft_iface);
- sysfs_del_meshif(soft_iface);
- mesh_free(soft_iface);
- unregister_netdevice(soft_iface);
-}
-
-/* ethtool */
-static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
- cmd->supported = 0;
- cmd->advertising = 0;
- cmd->speed = SPEED_10;
- cmd->duplex = DUPLEX_FULL;
- cmd->port = PORT_TP;
- cmd->phy_address = 0;
- cmd->transceiver = XCVR_INTERNAL;
- cmd->autoneg = AUTONEG_DISABLE;
- cmd->maxtxpkt = 0;
- cmd->maxrxpkt = 0;
-
- return 0;
-}
-
-static void bat_get_drvinfo(struct net_device *dev,
- struct ethtool_drvinfo *info)
-{
- strcpy(info->driver, "B.A.T.M.A.N. advanced");
- strcpy(info->version, SOURCE_VERSION);
- strcpy(info->fw_version, "N/A");
- strcpy(info->bus_info, "batman");
-}
-
-static u32 bat_get_msglevel(struct net_device *dev)
-{
- return -EOPNOTSUPP;
-}
-
-static void bat_set_msglevel(struct net_device *dev, u32 value)
-{
-}
-
-static u32 bat_get_link(struct net_device *dev)
-{
- return 1;
-}
-
-static u32 bat_get_rx_csum(struct net_device *dev)
-{
- return 0;
-}
-
-static int bat_set_rx_csum(struct net_device *dev, u32 data)
-{
- return -EOPNOTSUPP;
-}
diff --git a/drivers/staging/batman-adv/soft-interface.h b/drivers/staging/batman-adv/soft-interface.h
deleted file mode 100644
index 02b7733..0000000
--- a/drivers/staging/batman-adv/soft-interface.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_
-#define _NET_BATMAN_ADV_SOFT_INTERFACE_H_
-
-int my_skb_head_push(struct sk_buff *skb, unsigned int len);
-int softif_neigh_seq_print_text(struct seq_file *seq, void *offset);
-void softif_neigh_purge(struct bat_priv *bat_priv);
-int interface_tx(struct sk_buff *skb, struct net_device *soft_iface);
-void interface_rx(struct net_device *soft_iface,
- struct sk_buff *skb, struct batman_if *recv_if,
- int hdr_size);
-struct net_device *softif_create(char *name);
-void softif_destroy(struct net_device *soft_iface);
-
-#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
diff --git a/drivers/staging/batman-adv/sysfs-class-net-batman-adv b/drivers/staging/batman-adv/sysfs-class-net-batman-adv
deleted file mode 100644
index 38dd762..0000000
--- a/drivers/staging/batman-adv/sysfs-class-net-batman-adv
+++ /dev/null
@@ -1,14 +0,0 @@
-
-What: /sys/class/net/<iface>/batman-adv/mesh_iface
-Date: May 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- The /sys/class/net/<iface>/batman-adv/mesh_iface file
- displays the batman mesh interface this <iface>
- currently is associated with.
-
-What: /sys/class/net/<iface>/batman-adv/iface_status
-Date: May 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- Indicates the status of <iface> as it is seen by batman.
diff --git a/drivers/staging/batman-adv/sysfs-class-net-mesh b/drivers/staging/batman-adv/sysfs-class-net-mesh
deleted file mode 100644
index 748fe17..0000000
--- a/drivers/staging/batman-adv/sysfs-class-net-mesh
+++ /dev/null
@@ -1,69 +0,0 @@
-
-What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
-Date: May 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- Indicates whether the batman protocol messages of the
- mesh <mesh_iface> shall be aggregated or not.
-
-What: /sys/class/net/<mesh_iface>/mesh/bonding
-Date: June 2010
-Contact: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
-Description:
- Indicates whether the data traffic going through the
- mesh will be sent using multiple interfaces at the
- same time (if available).
-
-What: /sys/class/net/<mesh_iface>/mesh/fragmentation
-Date: October 2010
-Contact: Andreas Langer <an.langer(a)gmx.de>
-Description:
- Indicates whether the data traffic going through the
- mesh will be fragmented or silently discarded if the
- packet size exceeds the outgoing interface MTU.
-
-What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth
-Date: October 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- Defines the bandwidth which is propagated by this
- node if gw_mode was set to 'server'.
-
-What: /sys/class/net/<mesh_iface>/mesh/gw_mode
-Date: October 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- Defines the state of the gateway features. Can be
- either 'off', 'client' or 'server'.
-
-What: /sys/class/net/<mesh_iface>/mesh/gw_sel_class
-Date: October 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- Defines the selection criteria this node will use
- to choose a gateway if gw_mode was set to 'client'.
-
-What: /sys/class/net/<mesh_iface>/mesh/orig_interval
-Date: May 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- Defines the interval in milliseconds in which batman
- sends its protocol messages.
-
-What: /sys/class/net/<mesh_iface>/mesh/hop_penalty
-Date: Oct 2010
-Contact: Linus Lüssing <linus.luessing(a)web.de>
-Description:
- Defines the penalty which will be applied to an
- originator message's tq-field on every hop.
-
-What: /sys/class/net/<mesh_iface>/mesh/vis_mode
-Date: May 2010
-Contact: Marek Lindner <lindner_marek(a)yahoo.de>
-Description:
- Each batman node only maintains information about its
- own local neighborhood, therefore generating graphs
- showing the topology of the entire mesh is not easily
- feasible without having a central instance to collect
- the local topologies from all nodes. This file allows
- to activate the collecting (server) mode.
diff --git a/drivers/staging/batman-adv/translation-table.c b/drivers/staging/batman-adv/translation-table.c
deleted file mode 100644
index 4b0a107..0000000
--- a/drivers/staging/batman-adv/translation-table.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "translation-table.h"
-#include "soft-interface.h"
-#include "types.h"
-#include "hash.h"
-#include "originator.h"
-
-static void hna_local_purge(struct work_struct *work);
-static void _hna_global_del_orig(struct bat_priv *bat_priv,
- struct hna_global_entry *hna_global_entry,
- char *message);
-
-static void hna_local_start_timer(struct bat_priv *bat_priv)
-{
- INIT_DELAYED_WORK(&bat_priv->hna_work, hna_local_purge);
- queue_delayed_work(bat_event_workqueue, &bat_priv->hna_work, 10 * HZ);
-}
-
-int hna_local_init(struct bat_priv *bat_priv)
-{
- if (bat_priv->hna_local_hash)
- return 1;
-
- bat_priv->hna_local_hash = hash_new(128);
-
- if (!bat_priv->hna_local_hash)
- return 0;
-
- atomic_set(&bat_priv->hna_local_changed, 0);
- hna_local_start_timer(bat_priv);
-
- return 1;
-}
-
-void hna_local_add(struct net_device *soft_iface, uint8_t *addr)
-{
- struct bat_priv *bat_priv = netdev_priv(soft_iface);
- struct hna_local_entry *hna_local_entry;
- struct hna_global_entry *hna_global_entry;
- struct hashtable_t *swaphash;
- int required_bytes;
-
- spin_lock_bh(&bat_priv->hna_lhash_lock);
- hna_local_entry =
- ((struct hna_local_entry *)hash_find(bat_priv->hna_local_hash,
- compare_orig, choose_orig,
- addr));
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
-
- if (hna_local_entry) {
- hna_local_entry->last_seen = jiffies;
- return;
- }
-
- /* only announce as many hosts as possible in the batman-packet and
- space in batman_packet->num_hna That also should give a limit to
- MAC-flooding. */
- required_bytes = (bat_priv->num_local_hna + 1) * ETH_ALEN;
- required_bytes += BAT_PACKET_LEN;
-
- if ((required_bytes > ETH_DATA_LEN) ||
- (atomic_read(&bat_priv->aggregated_ogms) &&
- required_bytes > MAX_AGGREGATION_BYTES) ||
- (bat_priv->num_local_hna + 1 > 255)) {
- bat_dbg(DBG_ROUTES, bat_priv,
- "Can't add new local hna entry (%pM): "
- "number of local hna entries exceeds packet size\n",
- addr);
- return;
- }
-
- bat_dbg(DBG_ROUTES, bat_priv,
- "Creating new local hna entry: %pM\n", addr);
-
- hna_local_entry = kmalloc(sizeof(struct hna_local_entry), GFP_ATOMIC);
- if (!hna_local_entry)
- return;
-
- memcpy(hna_local_entry->addr, addr, ETH_ALEN);
- hna_local_entry->last_seen = jiffies;
-
- /* the batman interface mac address should never be purged */
- if (compare_orig(addr, soft_iface->dev_addr))
- hna_local_entry->never_purge = 1;
- else
- hna_local_entry->never_purge = 0;
-
- spin_lock_bh(&bat_priv->hna_lhash_lock);
-
- hash_add(bat_priv->hna_local_hash, compare_orig, choose_orig,
- hna_local_entry);
- bat_priv->num_local_hna++;
- atomic_set(&bat_priv->hna_local_changed, 1);
-
- if (bat_priv->hna_local_hash->elements * 4 >
- bat_priv->hna_local_hash->size) {
- swaphash = hash_resize(bat_priv->hna_local_hash, choose_orig,
- bat_priv->hna_local_hash->size * 2);
-
- if (!swaphash)
- pr_err("Couldn't resize local hna hash table\n");
- else
- bat_priv->hna_local_hash = swaphash;
- }
-
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
-
- /* remove address from global hash if present */
- spin_lock_bh(&bat_priv->hna_ghash_lock);
-
- hna_global_entry = ((struct hna_global_entry *)
- hash_find(bat_priv->hna_global_hash,
- compare_orig, choose_orig, addr));
-
- if (hna_global_entry)
- _hna_global_del_orig(bat_priv, hna_global_entry,
- "local hna received");
-
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
-}
-
-int hna_local_fill_buffer(struct bat_priv *bat_priv,
- unsigned char *buff, int buff_len)
-{
- struct hna_local_entry *hna_local_entry;
- struct element_t *bucket;
- HASHIT(hashit);
- int i = 0;
-
- spin_lock_bh(&bat_priv->hna_lhash_lock);
-
- while (hash_iterate(bat_priv->hna_local_hash, &hashit)) {
-
- if (buff_len < (i + 1) * ETH_ALEN)
- break;
-
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- hna_local_entry = bucket->data;
- memcpy(buff + (i * ETH_ALEN), hna_local_entry->addr, ETH_ALEN);
-
- i++;
- }
-
- /* if we did not get all new local hnas see you next time ;-) */
- if (i == bat_priv->num_local_hna)
- atomic_set(&bat_priv->hna_local_changed, 0);
-
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
- return i;
-}
-
-int hna_local_seq_print_text(struct seq_file *seq, void *offset)
-{
- struct net_device *net_dev = (struct net_device *)seq->private;
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- struct hna_local_entry *hna_local_entry;
- HASHIT(hashit);
- HASHIT(hashit_count);
- struct element_t *bucket;
- size_t buf_size, pos;
- char *buff;
-
- if (!bat_priv->primary_if) {
- return seq_printf(seq, "BATMAN mesh %s disabled - "
- "please specify interfaces to enable it\n",
- net_dev->name);
- }
-
- seq_printf(seq, "Locally retrieved addresses (from %s) "
- "announced via HNA:\n",
- net_dev->name);
-
- spin_lock_bh(&bat_priv->hna_lhash_lock);
-
- buf_size = 1;
- /* Estimate length for: " * xx:xx:xx:xx:xx:xx\n" */
- while (hash_iterate(bat_priv->hna_local_hash, &hashit_count))
- buf_size += 21;
-
- buff = kmalloc(buf_size, GFP_ATOMIC);
- if (!buff) {
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
- return -ENOMEM;
- }
- buff[0] = '\0';
- pos = 0;
-
- while (hash_iterate(bat_priv->hna_local_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- hna_local_entry = bucket->data;
-
- pos += snprintf(buff + pos, 22, " * %pM\n",
- hna_local_entry->addr);
- }
-
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
-
- seq_printf(seq, "%s", buff);
- kfree(buff);
- return 0;
-}
-
-static void _hna_local_del(void *data, void *arg)
-{
- struct bat_priv *bat_priv = (struct bat_priv *)arg;
-
- kfree(data);
- bat_priv->num_local_hna--;
- atomic_set(&bat_priv->hna_local_changed, 1);
-}
-
-static void hna_local_del(struct bat_priv *bat_priv,
- struct hna_local_entry *hna_local_entry,
- char *message)
-{
- bat_dbg(DBG_ROUTES, bat_priv, "Deleting local hna entry (%pM): %s\n",
- hna_local_entry->addr, message);
-
- hash_remove(bat_priv->hna_local_hash, compare_orig, choose_orig,
- hna_local_entry->addr);
- _hna_local_del(hna_local_entry, bat_priv);
-}
-
-void hna_local_remove(struct bat_priv *bat_priv,
- uint8_t *addr, char *message)
-{
- struct hna_local_entry *hna_local_entry;
-
- spin_lock_bh(&bat_priv->hna_lhash_lock);
-
- hna_local_entry = (struct hna_local_entry *)
- hash_find(bat_priv->hna_local_hash, compare_orig, choose_orig,
- addr);
- if (hna_local_entry)
- hna_local_del(bat_priv, hna_local_entry, message);
-
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
-}
-
-static void hna_local_purge(struct work_struct *work)
-{
- struct delayed_work *delayed_work =
- container_of(work, struct delayed_work, work);
- struct bat_priv *bat_priv =
- container_of(delayed_work, struct bat_priv, hna_work);
- struct hna_local_entry *hna_local_entry;
- HASHIT(hashit);
- struct element_t *bucket;
- unsigned long timeout;
-
- spin_lock_bh(&bat_priv->hna_lhash_lock);
-
- while (hash_iterate(bat_priv->hna_local_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- hna_local_entry = bucket->data;
-
- timeout = hna_local_entry->last_seen + LOCAL_HNA_TIMEOUT * HZ;
-
- if ((!hna_local_entry->never_purge) &&
- time_after(jiffies, timeout))
- hna_local_del(bat_priv, hna_local_entry,
- "address timed out");
- }
-
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
- hna_local_start_timer(bat_priv);
-}
-
-void hna_local_free(struct bat_priv *bat_priv)
-{
- if (!bat_priv->hna_local_hash)
- return;
-
- cancel_delayed_work_sync(&bat_priv->hna_work);
- hash_delete(bat_priv->hna_local_hash, _hna_local_del, bat_priv);
- bat_priv->hna_local_hash = NULL;
-}
-
-int hna_global_init(struct bat_priv *bat_priv)
-{
- if (bat_priv->hna_global_hash)
- return 1;
-
- bat_priv->hna_global_hash = hash_new(128);
-
- if (!bat_priv->hna_global_hash)
- return 0;
-
- return 1;
-}
-
-void hna_global_add_orig(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
- unsigned char *hna_buff, int hna_buff_len)
-{
- struct hna_global_entry *hna_global_entry;
- struct hna_local_entry *hna_local_entry;
- struct hashtable_t *swaphash;
- int hna_buff_count = 0;
- unsigned char *hna_ptr;
-
- while ((hna_buff_count + 1) * ETH_ALEN <= hna_buff_len) {
- spin_lock_bh(&bat_priv->hna_ghash_lock);
-
- hna_ptr = hna_buff + (hna_buff_count * ETH_ALEN);
- hna_global_entry = (struct hna_global_entry *)
- hash_find(bat_priv->hna_global_hash, compare_orig,
- choose_orig, hna_ptr);
-
- if (!hna_global_entry) {
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
-
- hna_global_entry =
- kmalloc(sizeof(struct hna_global_entry),
- GFP_ATOMIC);
-
- if (!hna_global_entry)
- break;
-
- memcpy(hna_global_entry->addr, hna_ptr, ETH_ALEN);
-
- bat_dbg(DBG_ROUTES, bat_priv,
- "Creating new global hna entry: "
- "%pM (via %pM)\n",
- hna_global_entry->addr, orig_node->orig);
-
- spin_lock_bh(&bat_priv->hna_ghash_lock);
- hash_add(bat_priv->hna_global_hash, compare_orig,
- choose_orig, hna_global_entry);
-
- }
-
- hna_global_entry->orig_node = orig_node;
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
-
- /* remove address from local hash if present */
- spin_lock_bh(&bat_priv->hna_lhash_lock);
-
- hna_ptr = hna_buff + (hna_buff_count * ETH_ALEN);
- hna_local_entry = (struct hna_local_entry *)
- hash_find(bat_priv->hna_local_hash, compare_orig,
- choose_orig, hna_ptr);
-
- if (hna_local_entry)
- hna_local_del(bat_priv, hna_local_entry,
- "global hna received");
-
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
-
- hna_buff_count++;
- }
-
- /* initialize, and overwrite if malloc succeeds */
- orig_node->hna_buff = NULL;
- orig_node->hna_buff_len = 0;
-
- if (hna_buff_len > 0) {
- orig_node->hna_buff = kmalloc(hna_buff_len, GFP_ATOMIC);
- if (orig_node->hna_buff) {
- memcpy(orig_node->hna_buff, hna_buff, hna_buff_len);
- orig_node->hna_buff_len = hna_buff_len;
- }
- }
-
- spin_lock_bh(&bat_priv->hna_ghash_lock);
-
- if (bat_priv->hna_global_hash->elements * 4 >
- bat_priv->hna_global_hash->size) {
- swaphash = hash_resize(bat_priv->hna_global_hash, choose_orig,
- bat_priv->hna_global_hash->size * 2);
-
- if (!swaphash)
- pr_err("Couldn't resize global hna hash table\n");
- else
- bat_priv->hna_global_hash = swaphash;
- }
-
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
-}
-
-int hna_global_seq_print_text(struct seq_file *seq, void *offset)
-{
- struct net_device *net_dev = (struct net_device *)seq->private;
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- struct hna_global_entry *hna_global_entry;
- HASHIT(hashit);
- HASHIT(hashit_count);
- struct element_t *bucket;
- size_t buf_size, pos;
- char *buff;
-
- if (!bat_priv->primary_if) {
- return seq_printf(seq, "BATMAN mesh %s disabled - "
- "please specify interfaces to enable it\n",
- net_dev->name);
- }
-
- seq_printf(seq, "Globally announced HNAs received via the mesh %s\n",
- net_dev->name);
-
- spin_lock_bh(&bat_priv->hna_ghash_lock);
-
- buf_size = 1;
- /* Estimate length for: " * xx:xx:xx:xx:xx:xx via xx:xx:xx:xx:xx:xx\n"*/
- while (hash_iterate(bat_priv->hna_global_hash, &hashit_count))
- buf_size += 43;
-
- buff = kmalloc(buf_size, GFP_ATOMIC);
- if (!buff) {
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
- return -ENOMEM;
- }
- buff[0] = '\0';
- pos = 0;
-
- while (hash_iterate(bat_priv->hna_global_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- hna_global_entry = bucket->data;
-
- pos += snprintf(buff + pos, 44,
- " * %pM via %pM\n", hna_global_entry->addr,
- hna_global_entry->orig_node->orig);
- }
-
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
-
- seq_printf(seq, "%s", buff);
- kfree(buff);
- return 0;
-}
-
-static void _hna_global_del_orig(struct bat_priv *bat_priv,
- struct hna_global_entry *hna_global_entry,
- char *message)
-{
- bat_dbg(DBG_ROUTES, bat_priv,
- "Deleting global hna entry %pM (via %pM): %s\n",
- hna_global_entry->addr, hna_global_entry->orig_node->orig,
- message);
-
- hash_remove(bat_priv->hna_global_hash, compare_orig, choose_orig,
- hna_global_entry->addr);
- kfree(hna_global_entry);
-}
-
-void hna_global_del_orig(struct bat_priv *bat_priv,
- struct orig_node *orig_node, char *message)
-{
- struct hna_global_entry *hna_global_entry;
- int hna_buff_count = 0;
- unsigned char *hna_ptr;
-
- if (orig_node->hna_buff_len == 0)
- return;
-
- spin_lock_bh(&bat_priv->hna_ghash_lock);
-
- while ((hna_buff_count + 1) * ETH_ALEN <= orig_node->hna_buff_len) {
- hna_ptr = orig_node->hna_buff + (hna_buff_count * ETH_ALEN);
- hna_global_entry = (struct hna_global_entry *)
- hash_find(bat_priv->hna_global_hash, compare_orig,
- choose_orig, hna_ptr);
-
- if ((hna_global_entry) &&
- (hna_global_entry->orig_node == orig_node))
- _hna_global_del_orig(bat_priv, hna_global_entry,
- message);
-
- hna_buff_count++;
- }
-
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
-
- orig_node->hna_buff_len = 0;
- kfree(orig_node->hna_buff);
- orig_node->hna_buff = NULL;
-}
-
-static void hna_global_del(void *data, void *arg)
-{
- kfree(data);
-}
-
-void hna_global_free(struct bat_priv *bat_priv)
-{
- if (!bat_priv->hna_global_hash)
- return;
-
- hash_delete(bat_priv->hna_global_hash, hna_global_del, NULL);
- bat_priv->hna_global_hash = NULL;
-}
-
-struct orig_node *transtable_search(struct bat_priv *bat_priv, uint8_t *addr)
-{
- struct hna_global_entry *hna_global_entry;
-
- spin_lock_bh(&bat_priv->hna_ghash_lock);
- hna_global_entry = (struct hna_global_entry *)
- hash_find(bat_priv->hna_global_hash,
- compare_orig, choose_orig, addr);
- spin_unlock_bh(&bat_priv->hna_ghash_lock);
-
- if (!hna_global_entry)
- return NULL;
-
- return hna_global_entry->orig_node;
-}
diff --git a/drivers/staging/batman-adv/translation-table.h b/drivers/staging/batman-adv/translation-table.h
deleted file mode 100644
index 10c4c5c..0000000
--- a/drivers/staging/batman-adv/translation-table.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
-#define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
-
-#include "types.h"
-
-int hna_local_init(struct bat_priv *bat_priv);
-void hna_local_add(struct net_device *soft_iface, uint8_t *addr);
-void hna_local_remove(struct bat_priv *bat_priv,
- uint8_t *addr, char *message);
-int hna_local_fill_buffer(struct bat_priv *bat_priv,
- unsigned char *buff, int buff_len);
-int hna_local_seq_print_text(struct seq_file *seq, void *offset);
-void hna_local_free(struct bat_priv *bat_priv);
-int hna_global_init(struct bat_priv *bat_priv);
-void hna_global_add_orig(struct bat_priv *bat_priv,
- struct orig_node *orig_node,
- unsigned char *hna_buff, int hna_buff_len);
-int hna_global_seq_print_text(struct seq_file *seq, void *offset);
-void hna_global_del_orig(struct bat_priv *bat_priv,
- struct orig_node *orig_node, char *message);
-void hna_global_free(struct bat_priv *bat_priv);
-struct orig_node *transtable_search(struct bat_priv *bat_priv, uint8_t *addr);
-
-#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
deleted file mode 100644
index 1d00849..0000000
--- a/drivers/staging/batman-adv/types.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-
-
-#ifndef _NET_BATMAN_ADV_TYPES_H_
-#define _NET_BATMAN_ADV_TYPES_H_
-
-#include "packet.h"
-#include "bitarray.h"
-
-#define BAT_HEADER_LEN (sizeof(struct ethhdr) + \
- ((sizeof(struct unicast_packet) > sizeof(struct bcast_packet) ? \
- sizeof(struct unicast_packet) : \
- sizeof(struct bcast_packet))))
-
-
-struct batman_if {
- struct list_head list;
- int16_t if_num;
- char if_status;
- struct net_device *net_dev;
- atomic_t seqno;
- atomic_t frag_seqno;
- unsigned char *packet_buff;
- int packet_len;
- struct kobject *hardif_obj;
- struct kref refcount;
- struct packet_type batman_adv_ptype;
- struct net_device *soft_iface;
- struct rcu_head rcu;
-};
-
-/**
- * orig_node - structure for orig_list maintaining nodes of mesh
- * @primary_addr: hosts primary interface address
- * @last_valid: when last packet from this node was received
- * @bcast_seqno_reset: time when the broadcast seqno window was reset
- * @batman_seqno_reset: time when the batman seqno window was reset
- * @gw_flags: flags related to gateway class
- * @flags: for now only VIS_SERVER flag
- * @last_real_seqno: last and best known squence number
- * @last_ttl: ttl of last received packet
- * @last_bcast_seqno: last broadcast sequence number received by this host
- *
- * @candidates: how many candidates are available
- * @selected: next bonding candidate
- */
-struct orig_node {
- uint8_t orig[ETH_ALEN];
- uint8_t primary_addr[ETH_ALEN];
- struct neigh_node *router;
- TYPE_OF_WORD *bcast_own;
- uint8_t *bcast_own_sum;
- uint8_t tq_own;
- int tq_asym_penalty;
- unsigned long last_valid;
- unsigned long bcast_seqno_reset;
- unsigned long batman_seqno_reset;
- uint8_t gw_flags;
- uint8_t flags;
- unsigned char *hna_buff;
- int16_t hna_buff_len;
- uint32_t last_real_seqno;
- uint8_t last_ttl;
- TYPE_OF_WORD bcast_bits[NUM_WORDS];
- uint32_t last_bcast_seqno;
- struct list_head neigh_list;
- struct list_head frag_list;
- unsigned long last_frag_packet;
- struct {
- uint8_t candidates;
- struct neigh_node *selected;
- } bond;
-};
-
-struct gw_node {
- struct hlist_node list;
- struct orig_node *orig_node;
- unsigned long deleted;
- struct kref refcount;
- struct rcu_head rcu;
-};
-
-/**
- * neigh_node
- * @last_valid: when last packet via this neighbor was received
- */
-struct neigh_node {
- struct list_head list;
- uint8_t addr[ETH_ALEN];
- uint8_t real_packet_count;
- uint8_t tq_recv[TQ_GLOBAL_WINDOW_SIZE];
- uint8_t tq_index;
- uint8_t tq_avg;
- uint8_t last_ttl;
- struct neigh_node *next_bond_candidate;
- unsigned long last_valid;
- TYPE_OF_WORD real_bits[NUM_WORDS];
- struct orig_node *orig_node;
- struct batman_if *if_incoming;
-};
-
-
-struct bat_priv {
- atomic_t mesh_state;
- struct net_device_stats stats;
- atomic_t aggregated_ogms; /* boolean */
- atomic_t bonding; /* boolean */
- atomic_t fragmentation; /* boolean */
- atomic_t vis_mode; /* VIS_TYPE_* */
- atomic_t gw_mode; /* GW_MODE_* */
- atomic_t gw_sel_class; /* uint */
- atomic_t gw_bandwidth; /* gw bandwidth */
- atomic_t orig_interval; /* uint */
- atomic_t hop_penalty; /* uint */
- atomic_t log_level; /* uint */
- atomic_t bcast_seqno;
- atomic_t bcast_queue_left;
- atomic_t batman_queue_left;
- char num_ifaces;
- struct hlist_head softif_neigh_list;
- struct softif_neigh *softif_neigh;
- struct debug_log *debug_log;
- struct batman_if *primary_if;
- struct kobject *mesh_obj;
- struct dentry *debug_dir;
- struct hlist_head forw_bat_list;
- struct hlist_head forw_bcast_list;
- struct hlist_head gw_list;
- struct list_head vis_send_list;
- struct hashtable_t *orig_hash;
- struct hashtable_t *hna_local_hash;
- struct hashtable_t *hna_global_hash;
- struct hashtable_t *vis_hash;
- spinlock_t orig_hash_lock; /* protects orig_hash */
- spinlock_t forw_bat_list_lock; /* protects forw_bat_list */
- spinlock_t forw_bcast_list_lock; /* protects */
- spinlock_t hna_lhash_lock; /* protects hna_local_hash */
- spinlock_t hna_ghash_lock; /* protects hna_global_hash */
- spinlock_t gw_list_lock; /* protects gw_list */
- spinlock_t vis_hash_lock; /* protects vis_hash */
- spinlock_t vis_list_lock; /* protects vis_info::recv_list */
- spinlock_t softif_neigh_lock; /* protects soft-interface neigh list */
- int16_t num_local_hna;
- atomic_t hna_local_changed;
- struct delayed_work hna_work;
- struct delayed_work orig_work;
- struct delayed_work vis_work;
- struct gw_node *curr_gw;
- struct vis_info *my_vis_info;
-};
-
-struct socket_client {
- struct list_head queue_list;
- unsigned int queue_len;
- unsigned char index;
- spinlock_t lock; /* protects queue_list, queue_len, index */
- wait_queue_head_t queue_wait;
- struct bat_priv *bat_priv;
-};
-
-struct socket_packet {
- struct list_head list;
- size_t icmp_len;
- struct icmp_packet_rr icmp_packet;
-};
-
-struct hna_local_entry {
- uint8_t addr[ETH_ALEN];
- unsigned long last_seen;
- char never_purge;
-};
-
-struct hna_global_entry {
- uint8_t addr[ETH_ALEN];
- struct orig_node *orig_node;
-};
-
-/**
- * forw_packet - structure for forw_list maintaining packets to be
- * send/forwarded
- */
-struct forw_packet {
- struct hlist_node list;
- unsigned long send_time;
- uint8_t own;
- struct sk_buff *skb;
- uint16_t packet_len;
- uint32_t direct_link_flags;
- uint8_t num_packets;
- struct delayed_work delayed_work;
- struct batman_if *if_incoming;
-};
-
-/* While scanning for vis-entries of a particular vis-originator
- * this list collects its interfaces to create a subgraph/cluster
- * out of them later
- */
-struct if_list_entry {
- uint8_t addr[ETH_ALEN];
- bool primary;
- struct hlist_node list;
-};
-
-struct debug_log {
- char log_buff[LOG_BUF_LEN];
- unsigned long log_start;
- unsigned long log_end;
- spinlock_t lock; /* protects log_buff, log_start and log_end */
- wait_queue_head_t queue_wait;
-};
-
-struct frag_packet_list_entry {
- struct list_head list;
- uint16_t seqno;
- struct sk_buff *skb;
-};
-
-struct vis_info {
- unsigned long first_seen;
- struct list_head recv_list;
- /* list of server-neighbors we received a vis-packet
- * from. we should not reply to them. */
- struct list_head send_list;
- struct kref refcount;
- struct bat_priv *bat_priv;
- /* this packet might be part of the vis send queue. */
- struct sk_buff *skb_packet;
- /* vis_info may follow here*/
-} __attribute__((packed));
-
-struct vis_info_entry {
- uint8_t src[ETH_ALEN];
- uint8_t dest[ETH_ALEN];
- uint8_t quality; /* quality = 0 means HNA */
-} __attribute__((packed));
-
-struct recvlist_node {
- struct list_head list;
- uint8_t mac[ETH_ALEN];
-};
-
-struct softif_neigh {
- struct hlist_node list;
- uint8_t addr[ETH_ALEN];
- unsigned long last_seen;
- short vid;
- struct kref refcount;
- struct rcu_head rcu;
-};
-
-#endif /* _NET_BATMAN_ADV_TYPES_H_ */
diff --git a/drivers/staging/batman-adv/unicast.c b/drivers/staging/batman-adv/unicast.c
deleted file mode 100644
index dc2e28b..0000000
--- a/drivers/staging/batman-adv/unicast.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Andreas Langer
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "unicast.h"
-#include "send.h"
-#include "soft-interface.h"
-#include "gateway_client.h"
-#include "originator.h"
-#include "hash.h"
-#include "translation-table.h"
-#include "routing.h"
-#include "hard-interface.h"
-
-
-static struct sk_buff *frag_merge_packet(struct list_head *head,
- struct frag_packet_list_entry *tfp,
- struct sk_buff *skb)
-{
- struct unicast_frag_packet *up =
- (struct unicast_frag_packet *)skb->data;
- struct sk_buff *tmp_skb;
- struct unicast_packet *unicast_packet;
- int hdr_len = sizeof(struct unicast_packet),
- uni_diff = sizeof(struct unicast_frag_packet) - hdr_len;
-
- /* set skb to the first part and tmp_skb to the second part */
- if (up->flags & UNI_FRAG_HEAD) {
- tmp_skb = tfp->skb;
- } else {
- tmp_skb = skb;
- skb = tfp->skb;
- }
-
- skb_pull(tmp_skb, sizeof(struct unicast_frag_packet));
- if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) {
- /* free buffered skb, skb will be freed later */
- kfree_skb(tfp->skb);
- return NULL;
- }
-
- /* move free entry to end */
- tfp->skb = NULL;
- tfp->seqno = 0;
- list_move_tail(&tfp->list, head);
-
- memcpy(skb_put(skb, tmp_skb->len), tmp_skb->data, tmp_skb->len);
- kfree_skb(tmp_skb);
-
- memmove(skb->data + uni_diff, skb->data, hdr_len);
- unicast_packet = (struct unicast_packet *) skb_pull(skb, uni_diff);
- unicast_packet->packet_type = BAT_UNICAST;
-
- return skb;
-}
-
-static void frag_create_entry(struct list_head *head, struct sk_buff *skb)
-{
- struct frag_packet_list_entry *tfp;
- struct unicast_frag_packet *up =
- (struct unicast_frag_packet *)skb->data;
-
- /* free and oldest packets stand at the end */
- tfp = list_entry((head)->prev, typeof(*tfp), list);
- kfree_skb(tfp->skb);
-
- tfp->seqno = ntohs(up->seqno);
- tfp->skb = skb;
- list_move(&tfp->list, head);
- return;
-}
-
-static int frag_create_buffer(struct list_head *head)
-{
- int i;
- struct frag_packet_list_entry *tfp;
-
- for (i = 0; i < FRAG_BUFFER_SIZE; i++) {
- tfp = kmalloc(sizeof(struct frag_packet_list_entry),
- GFP_ATOMIC);
- if (!tfp) {
- frag_list_free(head);
- return -ENOMEM;
- }
- tfp->skb = NULL;
- tfp->seqno = 0;
- INIT_LIST_HEAD(&tfp->list);
- list_add(&tfp->list, head);
- }
-
- return 0;
-}
-
-static struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
- struct unicast_frag_packet *up)
-{
- struct frag_packet_list_entry *tfp;
- struct unicast_frag_packet *tmp_up = NULL;
- uint16_t search_seqno;
-
- if (up->flags & UNI_FRAG_HEAD)
- search_seqno = ntohs(up->seqno)+1;
- else
- search_seqno = ntohs(up->seqno)-1;
-
- list_for_each_entry(tfp, head, list) {
-
- if (!tfp->skb)
- continue;
-
- if (tfp->seqno == ntohs(up->seqno))
- goto mov_tail;
-
- tmp_up = (struct unicast_frag_packet *)tfp->skb->data;
-
- if (tfp->seqno == search_seqno) {
-
- if ((tmp_up->flags & UNI_FRAG_HEAD) !=
- (up->flags & UNI_FRAG_HEAD))
- return tfp;
- else
- goto mov_tail;
- }
- }
- return NULL;
-
-mov_tail:
- list_move_tail(&tfp->list, head);
- return NULL;
-}
-
-void frag_list_free(struct list_head *head)
-{
- struct frag_packet_list_entry *pf, *tmp_pf;
-
- if (!list_empty(head)) {
-
- list_for_each_entry_safe(pf, tmp_pf, head, list) {
- kfree_skb(pf->skb);
- list_del(&pf->list);
- kfree(pf);
- }
- }
- return;
-}
-
-/* frag_reassemble_skb():
- * returns NET_RX_DROP if the operation failed - skb is left intact
- * returns NET_RX_SUCCESS if the fragment was buffered (skb_new will be NULL)
- * or the skb could be reassembled (skb_new will point to the new packet and
- * skb was freed)
- */
-int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
- struct sk_buff **new_skb)
-{
- struct orig_node *orig_node;
- struct frag_packet_list_entry *tmp_frag_entry;
- int ret = NET_RX_DROP;
- struct unicast_frag_packet *unicast_packet =
- (struct unicast_frag_packet *)skb->data;
-
- *new_skb = NULL;
- spin_lock_bh(&bat_priv->orig_hash_lock);
- orig_node = ((struct orig_node *)
- hash_find(bat_priv->orig_hash, compare_orig, choose_orig,
- unicast_packet->orig));
-
- if (!orig_node) {
- pr_debug("couldn't find originator in orig_hash\n");
- goto out;
- }
-
- orig_node->last_frag_packet = jiffies;
-
- if (list_empty(&orig_node->frag_list) &&
- frag_create_buffer(&orig_node->frag_list)) {
- pr_debug("couldn't create frag buffer\n");
- goto out;
- }
-
- tmp_frag_entry = frag_search_packet(&orig_node->frag_list,
- unicast_packet);
-
- if (!tmp_frag_entry) {
- frag_create_entry(&orig_node->frag_list, skb);
- ret = NET_RX_SUCCESS;
- goto out;
- }
-
- *new_skb = frag_merge_packet(&orig_node->frag_list, tmp_frag_entry,
- skb);
- /* if not, merge failed */
- if (*new_skb)
- ret = NET_RX_SUCCESS;
-out:
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- return ret;
-}
-
-int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
- struct batman_if *batman_if, uint8_t dstaddr[])
-{
- struct unicast_packet tmp_uc, *unicast_packet;
- struct sk_buff *frag_skb;
- struct unicast_frag_packet *frag1, *frag2;
- int uc_hdr_len = sizeof(struct unicast_packet);
- int ucf_hdr_len = sizeof(struct unicast_frag_packet);
- int data_len = skb->len;
-
- if (!bat_priv->primary_if)
- goto dropped;
-
- unicast_packet = (struct unicast_packet *) skb->data;
-
- memcpy(&tmp_uc, unicast_packet, uc_hdr_len);
- frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len);
- skb_split(skb, frag_skb, data_len / 2);
-
- if (my_skb_head_push(skb, ucf_hdr_len - uc_hdr_len) < 0 ||
- my_skb_head_push(frag_skb, ucf_hdr_len) < 0)
- goto drop_frag;
-
- frag1 = (struct unicast_frag_packet *)skb->data;
- frag2 = (struct unicast_frag_packet *)frag_skb->data;
-
- memcpy(frag1, &tmp_uc, sizeof(struct unicast_packet));
-
- frag1->ttl--;
- frag1->version = COMPAT_VERSION;
- frag1->packet_type = BAT_UNICAST_FRAG;
-
- memcpy(frag1->orig, bat_priv->primary_if->net_dev->dev_addr, ETH_ALEN);
- memcpy(frag2, frag1, sizeof(struct unicast_frag_packet));
-
- frag1->flags |= UNI_FRAG_HEAD;
- frag2->flags &= ~UNI_FRAG_HEAD;
-
- frag1->seqno = htons((uint16_t)atomic_inc_return(
- &batman_if->frag_seqno));
- frag2->seqno = htons((uint16_t)atomic_inc_return(
- &batman_if->frag_seqno));
-
- send_skb_packet(skb, batman_if, dstaddr);
- send_skb_packet(frag_skb, batman_if, dstaddr);
- return NET_RX_SUCCESS;
-
-drop_frag:
- kfree_skb(frag_skb);
-dropped:
- kfree_skb(skb);
- return NET_RX_DROP;
-}
-
-int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
-{
- struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
- struct unicast_packet *unicast_packet;
- struct orig_node *orig_node;
- struct batman_if *batman_if;
- struct neigh_node *router;
- int data_len = skb->len;
- uint8_t dstaddr[6];
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
-
- /* get routing information */
- if (is_multicast_ether_addr(ethhdr->h_dest))
- orig_node = (struct orig_node *)gw_get_selected(bat_priv);
- else
- orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
- compare_orig,
- choose_orig,
- ethhdr->h_dest));
-
- /* check for hna host */
- if (!orig_node)
- orig_node = transtable_search(bat_priv, ethhdr->h_dest);
-
- router = find_router(bat_priv, orig_node, NULL);
-
- if (!router)
- goto unlock;
-
- /* don't lock while sending the packets ... we therefore
- * copy the required data before sending */
-
- batman_if = router->if_incoming;
- memcpy(dstaddr, router->addr, ETH_ALEN);
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- if (batman_if->if_status != IF_ACTIVE)
- goto dropped;
-
- if (my_skb_head_push(skb, sizeof(struct unicast_packet)) < 0)
- goto dropped;
-
- unicast_packet = (struct unicast_packet *)skb->data;
-
- unicast_packet->version = COMPAT_VERSION;
- /* batman packet type: unicast */
- unicast_packet->packet_type = BAT_UNICAST;
- /* set unicast ttl */
- unicast_packet->ttl = TTL;
- /* copy the destination for faster routing */
- memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
-
- if (atomic_read(&bat_priv->fragmentation) &&
- data_len + sizeof(struct unicast_packet) >
- batman_if->net_dev->mtu) {
- /* send frag skb decreases ttl */
- unicast_packet->ttl++;
- return frag_send_skb(skb, bat_priv, batman_if,
- dstaddr);
- }
- send_skb_packet(skb, batman_if, dstaddr);
- return 0;
-
-unlock:
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-dropped:
- kfree_skb(skb);
- return 1;
-}
diff --git a/drivers/staging/batman-adv/unicast.h b/drivers/staging/batman-adv/unicast.h
deleted file mode 100644
index e32b786..0000000
--- a/drivers/staging/batman-adv/unicast.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 B.A.T.M.A.N. contributors:
- *
- * Andreas Langer
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_UNICAST_H_
-#define _NET_BATMAN_ADV_UNICAST_H_
-
-#define FRAG_TIMEOUT 10000 /* purge frag list entrys after time in ms */
-#define FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */
-
-int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
- struct sk_buff **new_skb);
-void frag_list_free(struct list_head *head);
-int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
-int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
- struct batman_if *batman_if, uint8_t dstaddr[]);
-
-#endif /* _NET_BATMAN_ADV_UNICAST_H_ */
diff --git a/drivers/staging/batman-adv/vis.c b/drivers/staging/batman-adv/vis.c
deleted file mode 100644
index 957a086..0000000
--- a/drivers/staging/batman-adv/vis.c
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * Copyright (C) 2008-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "send.h"
-#include "translation-table.h"
-#include "vis.h"
-#include "soft-interface.h"
-#include "hard-interface.h"
-#include "hash.h"
-#include "originator.h"
-
-#define MAX_VIS_PACKET_SIZE 1000
-
-/* Returns the smallest signed integer in two's complement with the sizeof x */
-#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u)))
-
-/* Checks if a sequence number x is a predecessor/successor of y.
- * they handle overflows/underflows and can correctly check for a
- * predecessor/successor unless the variable sequence number has grown by
- * more then 2**(bitwidth(x)-1)-1.
- * This means that for a uint8_t with the maximum value 255, it would think:
- * - when adding nothing - it is neither a predecessor nor a successor
- * - before adding more than 127 to the starting value - it is a predecessor,
- * - when adding 128 - it is neither a predecessor nor a successor,
- * - after adding more than 127 to the starting value - it is a successor */
-#define seq_before(x, y) ({typeof(x) _dummy = (x - y); \
- _dummy > smallest_signed_int(_dummy); })
-#define seq_after(x, y) seq_before(y, x)
-
-static void start_vis_timer(struct bat_priv *bat_priv);
-
-/* free the info */
-static void free_info(struct kref *ref)
-{
- struct vis_info *info = container_of(ref, struct vis_info, refcount);
- struct bat_priv *bat_priv = info->bat_priv;
- struct recvlist_node *entry, *tmp;
-
- list_del_init(&info->send_list);
- spin_lock_bh(&bat_priv->vis_list_lock);
- list_for_each_entry_safe(entry, tmp, &info->recv_list, list) {
- list_del(&entry->list);
- kfree(entry);
- }
-
- spin_unlock_bh(&bat_priv->vis_list_lock);
- kfree_skb(info->skb_packet);
-}
-
-/* Compare two vis packets, used by the hashing algorithm */
-static int vis_info_cmp(void *data1, void *data2)
-{
- struct vis_info *d1, *d2;
- struct vis_packet *p1, *p2;
- d1 = data1;
- d2 = data2;
- p1 = (struct vis_packet *)d1->skb_packet->data;
- p2 = (struct vis_packet *)d2->skb_packet->data;
- return compare_orig(p1->vis_orig, p2->vis_orig);
-}
-
-/* hash function to choose an entry in a hash table of given size */
-/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */
-static int vis_info_choose(void *data, int size)
-{
- struct vis_info *vis_info = data;
- struct vis_packet *packet;
- unsigned char *key;
- uint32_t hash = 0;
- size_t i;
-
- packet = (struct vis_packet *)vis_info->skb_packet->data;
- key = packet->vis_orig;
- for (i = 0; i < ETH_ALEN; i++) {
- hash += key[i];
- hash += (hash << 10);
- hash ^= (hash >> 6);
- }
-
- hash += (hash << 3);
- hash ^= (hash >> 11);
- hash += (hash << 15);
-
- return hash % size;
-}
-
-/* insert interface to the list of interfaces of one originator, if it
- * does not already exist in the list */
-static void vis_data_insert_interface(const uint8_t *interface,
- struct hlist_head *if_list,
- bool primary)
-{
- struct if_list_entry *entry;
- struct hlist_node *pos;
-
- hlist_for_each_entry(entry, pos, if_list, list) {
- if (compare_orig(entry->addr, (void *)interface))
- return;
- }
-
- /* its a new address, add it to the list */
- entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
- if (!entry)
- return;
- memcpy(entry->addr, interface, ETH_ALEN);
- entry->primary = primary;
- hlist_add_head(&entry->list, if_list);
-}
-
-static ssize_t vis_data_read_prim_sec(char *buff, struct hlist_head *if_list)
-{
- struct if_list_entry *entry;
- struct hlist_node *pos;
- size_t len = 0;
-
- hlist_for_each_entry(entry, pos, if_list, list) {
- if (entry->primary)
- len += sprintf(buff + len, "PRIMARY, ");
- else
- len += sprintf(buff + len, "SEC %pM, ", entry->addr);
- }
-
- return len;
-}
-
-static size_t vis_data_count_prim_sec(struct hlist_head *if_list)
-{
- struct if_list_entry *entry;
- struct hlist_node *pos;
- size_t count = 0;
-
- hlist_for_each_entry(entry, pos, if_list, list) {
- if (entry->primary)
- count += 9;
- else
- count += 23;
- }
-
- return count;
-}
-
-/* read an entry */
-static ssize_t vis_data_read_entry(char *buff, struct vis_info_entry *entry,
- uint8_t *src, bool primary)
-{
- /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */
- if (primary && entry->quality == 0)
- return sprintf(buff, "HNA %pM, ", entry->dest);
- else if (compare_orig(entry->src, src))
- return sprintf(buff, "TQ %pM %d, ", entry->dest,
- entry->quality);
-
- return 0;
-}
-
-int vis_seq_print_text(struct seq_file *seq, void *offset)
-{
- HASHIT(hashit);
- HASHIT(hashit_count);
- struct element_t *bucket;
- struct vis_info *info;
- struct vis_packet *packet;
- struct vis_info_entry *entries;
- struct net_device *net_dev = (struct net_device *)seq->private;
- struct bat_priv *bat_priv = netdev_priv(net_dev);
- HLIST_HEAD(vis_if_list);
- struct if_list_entry *entry;
- struct hlist_node *pos, *n;
- int i;
- int vis_server = atomic_read(&bat_priv->vis_mode);
- size_t buff_pos, buf_size;
- char *buff;
-
- if ((!bat_priv->primary_if) ||
- (vis_server == VIS_TYPE_CLIENT_UPDATE))
- return 0;
-
- buf_size = 1;
- /* Estimate length */
- spin_lock_bh(&bat_priv->vis_hash_lock);
- while (hash_iterate(bat_priv->vis_hash, &hashit_count)) {
- bucket = hlist_entry(hashit_count.walk, struct element_t,
- hlist);
- info = bucket->data;
- packet = (struct vis_packet *)info->skb_packet->data;
- entries = (struct vis_info_entry *)
- ((char *)packet + sizeof(struct vis_packet));
-
- for (i = 0; i < packet->entries; i++) {
- if (entries[i].quality == 0)
- continue;
- vis_data_insert_interface(entries[i].src, &vis_if_list,
- compare_orig(entries[i].src, packet->vis_orig));
- }
-
- hlist_for_each_entry(entry, pos, &vis_if_list, list) {
- buf_size += 18 + 26 * packet->entries;
-
- /* add primary/secondary records */
- if (compare_orig(entry->addr, packet->vis_orig))
- buf_size +=
- vis_data_count_prim_sec(&vis_if_list);
-
- buf_size += 1;
- }
-
- hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, list) {
- hlist_del(&entry->list);
- kfree(entry);
- }
- }
-
- buff = kmalloc(buf_size, GFP_ATOMIC);
- if (!buff) {
- spin_unlock_bh(&bat_priv->vis_hash_lock);
- return -ENOMEM;
- }
- buff[0] = '\0';
- buff_pos = 0;
-
- while (hash_iterate(bat_priv->vis_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- info = bucket->data;
- packet = (struct vis_packet *)info->skb_packet->data;
- entries = (struct vis_info_entry *)
- ((char *)packet + sizeof(struct vis_packet));
-
- for (i = 0; i < packet->entries; i++) {
- if (entries[i].quality == 0)
- continue;
- vis_data_insert_interface(entries[i].src, &vis_if_list,
- compare_orig(entries[i].src, packet->vis_orig));
- }
-
- hlist_for_each_entry(entry, pos, &vis_if_list, list) {
- buff_pos += sprintf(buff + buff_pos, "%pM,",
- entry->addr);
-
- for (i = 0; i < packet->entries; i++)
- buff_pos += vis_data_read_entry(buff + buff_pos,
- &entries[i],
- entry->addr,
- entry->primary);
-
- /* add primary/secondary records */
- if (compare_orig(entry->addr, packet->vis_orig))
- buff_pos +=
- vis_data_read_prim_sec(buff + buff_pos,
- &vis_if_list);
-
- buff_pos += sprintf(buff + buff_pos, "\n");
- }
-
- hlist_for_each_entry_safe(entry, pos, n, &vis_if_list, list) {
- hlist_del(&entry->list);
- kfree(entry);
- }
- }
-
- spin_unlock_bh(&bat_priv->vis_hash_lock);
-
- seq_printf(seq, "%s", buff);
- kfree(buff);
-
- return 0;
-}
-
-/* add the info packet to the send list, if it was not
- * already linked in. */
-static void send_list_add(struct bat_priv *bat_priv, struct vis_info *info)
-{
- if (list_empty(&info->send_list)) {
- kref_get(&info->refcount);
- list_add_tail(&info->send_list, &bat_priv->vis_send_list);
- }
-}
-
-/* delete the info packet from the send list, if it was
- * linked in. */
-static void send_list_del(struct vis_info *info)
-{
- if (!list_empty(&info->send_list)) {
- list_del_init(&info->send_list);
- kref_put(&info->refcount, free_info);
- }
-}
-
-/* tries to add one entry to the receive list. */
-static void recv_list_add(struct bat_priv *bat_priv,
- struct list_head *recv_list, char *mac)
-{
- struct recvlist_node *entry;
-
- entry = kmalloc(sizeof(struct recvlist_node), GFP_ATOMIC);
- if (!entry)
- return;
-
- memcpy(entry->mac, mac, ETH_ALEN);
- spin_lock_bh(&bat_priv->vis_list_lock);
- list_add_tail(&entry->list, recv_list);
- spin_unlock_bh(&bat_priv->vis_list_lock);
-}
-
-/* returns 1 if this mac is in the recv_list */
-static int recv_list_is_in(struct bat_priv *bat_priv,
- struct list_head *recv_list, char *mac)
-{
- struct recvlist_node *entry;
-
- spin_lock_bh(&bat_priv->vis_list_lock);
- list_for_each_entry(entry, recv_list, list) {
- if (memcmp(entry->mac, mac, ETH_ALEN) == 0) {
- spin_unlock_bh(&bat_priv->vis_list_lock);
- return 1;
- }
- }
- spin_unlock_bh(&bat_priv->vis_list_lock);
- return 0;
-}
-
-/* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old,
- * broken.. ). vis hash must be locked outside. is_new is set when the packet
- * is newer than old entries in the hash. */
-static struct vis_info *add_packet(struct bat_priv *bat_priv,
- struct vis_packet *vis_packet,
- int vis_info_len, int *is_new,
- int make_broadcast)
-{
- struct vis_info *info, *old_info;
- struct vis_packet *search_packet, *old_packet;
- struct vis_info search_elem;
- struct vis_packet *packet;
- int hash_added;
-
- *is_new = 0;
- /* sanity check */
- if (!bat_priv->vis_hash)
- return NULL;
-
- /* see if the packet is already in vis_hash */
- search_elem.skb_packet = dev_alloc_skb(sizeof(struct vis_packet));
- if (!search_elem.skb_packet)
- return NULL;
- search_packet = (struct vis_packet *)skb_put(search_elem.skb_packet,
- sizeof(struct vis_packet));
-
- memcpy(search_packet->vis_orig, vis_packet->vis_orig, ETH_ALEN);
- old_info = hash_find(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
- &search_elem);
- kfree_skb(search_elem.skb_packet);
-
- if (old_info != NULL) {
- old_packet = (struct vis_packet *)old_info->skb_packet->data;
- if (!seq_after(ntohl(vis_packet->seqno),
- ntohl(old_packet->seqno))) {
- if (old_packet->seqno == vis_packet->seqno) {
- recv_list_add(bat_priv, &old_info->recv_list,
- vis_packet->sender_orig);
- return old_info;
- } else {
- /* newer packet is already in hash. */
- return NULL;
- }
- }
- /* remove old entry */
- hash_remove(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
- old_info);
- send_list_del(old_info);
- kref_put(&old_info->refcount, free_info);
- }
-
- info = kmalloc(sizeof(struct vis_info), GFP_ATOMIC);
- if (!info)
- return NULL;
-
- info->skb_packet = dev_alloc_skb(sizeof(struct vis_packet) +
- vis_info_len + sizeof(struct ethhdr));
- if (!info->skb_packet) {
- kfree(info);
- return NULL;
- }
- skb_reserve(info->skb_packet, sizeof(struct ethhdr));
- packet = (struct vis_packet *)skb_put(info->skb_packet,
- sizeof(struct vis_packet) +
- vis_info_len);
-
- kref_init(&info->refcount);
- INIT_LIST_HEAD(&info->send_list);
- INIT_LIST_HEAD(&info->recv_list);
- info->first_seen = jiffies;
- info->bat_priv = bat_priv;
- memcpy(packet, vis_packet, sizeof(struct vis_packet) + vis_info_len);
-
- /* initialize and add new packet. */
- *is_new = 1;
-
- /* Make it a broadcast packet, if required */
- if (make_broadcast)
- memcpy(packet->target_orig, broadcast_addr, ETH_ALEN);
-
- /* repair if entries is longer than packet. */
- if (packet->entries * sizeof(struct vis_info_entry) > vis_info_len)
- packet->entries = vis_info_len / sizeof(struct vis_info_entry);
-
- recv_list_add(bat_priv, &info->recv_list, packet->sender_orig);
-
- /* try to add it */
- hash_added = hash_add(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
- info);
- if (hash_added < 0) {
- /* did not work (for some reason) */
- kref_put(&old_info->refcount, free_info);
- info = NULL;
- }
-
- return info;
-}
-
-/* handle the server sync packet, forward if needed. */
-void receive_server_sync_packet(struct bat_priv *bat_priv,
- struct vis_packet *vis_packet,
- int vis_info_len)
-{
- struct vis_info *info;
- int is_new, make_broadcast;
- int vis_server = atomic_read(&bat_priv->vis_mode);
-
- make_broadcast = (vis_server == VIS_TYPE_SERVER_SYNC);
-
- spin_lock_bh(&bat_priv->vis_hash_lock);
- info = add_packet(bat_priv, vis_packet, vis_info_len,
- &is_new, make_broadcast);
- if (!info)
- goto end;
-
- /* only if we are server ourselves and packet is newer than the one in
- * hash.*/
- if (vis_server == VIS_TYPE_SERVER_SYNC && is_new)
- send_list_add(bat_priv, info);
-end:
- spin_unlock_bh(&bat_priv->vis_hash_lock);
-}
-
-/* handle an incoming client update packet and schedule forward if needed. */
-void receive_client_update_packet(struct bat_priv *bat_priv,
- struct vis_packet *vis_packet,
- int vis_info_len)
-{
- struct vis_info *info;
- struct vis_packet *packet;
- int is_new;
- int vis_server = atomic_read(&bat_priv->vis_mode);
- int are_target = 0;
-
- /* clients shall not broadcast. */
- if (is_broadcast_ether_addr(vis_packet->target_orig))
- return;
-
- /* Are we the target for this VIS packet? */
- if (vis_server == VIS_TYPE_SERVER_SYNC &&
- is_my_mac(vis_packet->target_orig))
- are_target = 1;
-
- spin_lock_bh(&bat_priv->vis_hash_lock);
- info = add_packet(bat_priv, vis_packet, vis_info_len,
- &is_new, are_target);
-
- if (!info)
- goto end;
- /* note that outdated packets will be dropped at this point. */
-
- packet = (struct vis_packet *)info->skb_packet->data;
-
- /* send only if we're the target server or ... */
- if (are_target && is_new) {
- packet->vis_type = VIS_TYPE_SERVER_SYNC; /* upgrade! */
- send_list_add(bat_priv, info);
-
- /* ... we're not the recipient (and thus need to forward). */
- } else if (!is_my_mac(packet->target_orig)) {
- send_list_add(bat_priv, info);
- }
-
-end:
- spin_unlock_bh(&bat_priv->vis_hash_lock);
-}
-
-/* Walk the originators and find the VIS server with the best tq. Set the packet
- * address to its address and return the best_tq.
- *
- * Must be called with the originator hash locked */
-static int find_best_vis_server(struct bat_priv *bat_priv,
- struct vis_info *info)
-{
- HASHIT(hashit);
- struct element_t *bucket;
- struct orig_node *orig_node;
- struct vis_packet *packet;
- int best_tq = -1;
-
- packet = (struct vis_packet *)info->skb_packet->data;
-
- while (hash_iterate(bat_priv->orig_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- orig_node = bucket->data;
- if ((orig_node) && (orig_node->router) &&
- (orig_node->flags & VIS_SERVER) &&
- (orig_node->router->tq_avg > best_tq)) {
- best_tq = orig_node->router->tq_avg;
- memcpy(packet->target_orig, orig_node->orig, ETH_ALEN);
- }
- }
- return best_tq;
-}
-
-/* Return true if the vis packet is full. */
-static bool vis_packet_full(struct vis_info *info)
-{
- struct vis_packet *packet;
- packet = (struct vis_packet *)info->skb_packet->data;
-
- if (MAX_VIS_PACKET_SIZE / sizeof(struct vis_info_entry)
- < packet->entries + 1)
- return true;
- return false;
-}
-
-/* generates a packet of own vis data,
- * returns 0 on success, -1 if no packet could be generated */
-static int generate_vis_packet(struct bat_priv *bat_priv)
-{
- HASHIT(hashit_local);
- HASHIT(hashit_global);
- struct element_t *bucket;
- struct orig_node *orig_node;
- struct vis_info *info = (struct vis_info *)bat_priv->my_vis_info;
- struct vis_packet *packet = (struct vis_packet *)info->skb_packet->data;
- struct vis_info_entry *entry;
- struct hna_local_entry *hna_local_entry;
- int best_tq = -1;
-
- info->first_seen = jiffies;
- packet->vis_type = atomic_read(&bat_priv->vis_mode);
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- memcpy(packet->target_orig, broadcast_addr, ETH_ALEN);
- packet->ttl = TTL;
- packet->seqno = htonl(ntohl(packet->seqno) + 1);
- packet->entries = 0;
- skb_trim(info->skb_packet, sizeof(struct vis_packet));
-
- if (packet->vis_type == VIS_TYPE_CLIENT_UPDATE) {
- best_tq = find_best_vis_server(bat_priv, info);
-
- if (best_tq < 0) {
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return -1;
- }
- }
-
- while (hash_iterate(bat_priv->orig_hash, &hashit_global)) {
- bucket = hlist_entry(hashit_global.walk, struct element_t,
- hlist);
- orig_node = bucket->data;
-
- if (!orig_node->router)
- continue;
-
- if (!compare_orig(orig_node->router->addr, orig_node->orig))
- continue;
-
- if (orig_node->router->if_incoming->if_status != IF_ACTIVE)
- continue;
-
- if (orig_node->router->tq_avg < 1)
- continue;
-
- /* fill one entry into buffer. */
- entry = (struct vis_info_entry *)
- skb_put(info->skb_packet, sizeof(*entry));
- memcpy(entry->src,
- orig_node->router->if_incoming->net_dev->dev_addr,
- ETH_ALEN);
- memcpy(entry->dest, orig_node->orig, ETH_ALEN);
- entry->quality = orig_node->router->tq_avg;
- packet->entries++;
-
- if (vis_packet_full(info)) {
- spin_unlock_bh(&bat_priv->orig_hash_lock);
- return 0;
- }
- }
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- spin_lock_bh(&bat_priv->hna_lhash_lock);
- while (hash_iterate(bat_priv->hna_local_hash, &hashit_local)) {
- bucket = hlist_entry(hashit_local.walk, struct element_t,
- hlist);
- hna_local_entry = bucket->data;
- entry = (struct vis_info_entry *)skb_put(info->skb_packet,
- sizeof(*entry));
- memset(entry->src, 0, ETH_ALEN);
- memcpy(entry->dest, hna_local_entry->addr, ETH_ALEN);
- entry->quality = 0; /* 0 means HNA */
- packet->entries++;
-
- if (vis_packet_full(info)) {
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
- return 0;
- }
- }
-
- spin_unlock_bh(&bat_priv->hna_lhash_lock);
- return 0;
-}
-
-/* free old vis packets. Must be called with this vis_hash_lock
- * held */
-static void purge_vis_packets(struct bat_priv *bat_priv)
-{
- HASHIT(hashit);
- struct element_t *bucket;
- struct vis_info *info;
-
- while (hash_iterate(bat_priv->vis_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- info = bucket->data;
-
- /* never purge own data. */
- if (info == bat_priv->my_vis_info)
- continue;
-
- if (time_after(jiffies,
- info->first_seen + VIS_TIMEOUT * HZ)) {
- hash_remove_bucket(bat_priv->vis_hash, &hashit);
- send_list_del(info);
- kref_put(&info->refcount, free_info);
- }
- }
-}
-
-static void broadcast_vis_packet(struct bat_priv *bat_priv,
- struct vis_info *info)
-{
- HASHIT(hashit);
- struct element_t *bucket;
- struct orig_node *orig_node;
- struct vis_packet *packet;
- struct sk_buff *skb;
- struct batman_if *batman_if;
- uint8_t dstaddr[ETH_ALEN];
-
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- packet = (struct vis_packet *)info->skb_packet->data;
-
- /* send to all routers in range. */
- while (hash_iterate(bat_priv->orig_hash, &hashit)) {
- bucket = hlist_entry(hashit.walk, struct element_t, hlist);
- orig_node = bucket->data;
-
- /* if it's a vis server and reachable, send it. */
- if ((!orig_node) || (!orig_node->router))
- continue;
- if (!(orig_node->flags & VIS_SERVER))
- continue;
- /* don't send it if we already received the packet from
- * this node. */
- if (recv_list_is_in(bat_priv, &info->recv_list,
- orig_node->orig))
- continue;
-
- memcpy(packet->target_orig, orig_node->orig, ETH_ALEN);
- batman_if = orig_node->router->if_incoming;
- memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- skb = skb_clone(info->skb_packet, GFP_ATOMIC);
- if (skb)
- send_skb_packet(skb, batman_if, dstaddr);
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
-
- }
-
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-}
-
-static void unicast_vis_packet(struct bat_priv *bat_priv,
- struct vis_info *info)
-{
- struct orig_node *orig_node;
- struct sk_buff *skb;
- struct vis_packet *packet;
- struct batman_if *batman_if;
- uint8_t dstaddr[ETH_ALEN];
-
- spin_lock_bh(&bat_priv->orig_hash_lock);
- packet = (struct vis_packet *)info->skb_packet->data;
- orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
- compare_orig, choose_orig,
- packet->target_orig));
-
- if ((!orig_node) || (!orig_node->router))
- goto out;
-
- /* don't lock while sending the packets ... we therefore
- * copy the required data before sending */
- batman_if = orig_node->router->if_incoming;
- memcpy(dstaddr, orig_node->router->addr, ETH_ALEN);
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-
- skb = skb_clone(info->skb_packet, GFP_ATOMIC);
- if (skb)
- send_skb_packet(skb, batman_if, dstaddr);
-
- return;
-
-out:
- spin_unlock_bh(&bat_priv->orig_hash_lock);
-}
-
-/* only send one vis packet. called from send_vis_packets() */
-static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info)
-{
- struct vis_packet *packet;
-
- packet = (struct vis_packet *)info->skb_packet->data;
- if (packet->ttl < 2) {
- pr_debug("Error - can't send vis packet: ttl exceeded\n");
- return;
- }
-
- memcpy(packet->sender_orig, bat_priv->primary_if->net_dev->dev_addr,
- ETH_ALEN);
- packet->ttl--;
-
- if (is_broadcast_ether_addr(packet->target_orig))
- broadcast_vis_packet(bat_priv, info);
- else
- unicast_vis_packet(bat_priv, info);
- packet->ttl++; /* restore TTL */
-}
-
-/* called from timer; send (and maybe generate) vis packet. */
-static void send_vis_packets(struct work_struct *work)
-{
- struct delayed_work *delayed_work =
- container_of(work, struct delayed_work, work);
- struct bat_priv *bat_priv =
- container_of(delayed_work, struct bat_priv, vis_work);
- struct vis_info *info, *temp;
-
- spin_lock_bh(&bat_priv->vis_hash_lock);
- purge_vis_packets(bat_priv);
-
- if (generate_vis_packet(bat_priv) == 0) {
- /* schedule if generation was successful */
- send_list_add(bat_priv, bat_priv->my_vis_info);
- }
-
- list_for_each_entry_safe(info, temp, &bat_priv->vis_send_list,
- send_list) {
-
- kref_get(&info->refcount);
- spin_unlock_bh(&bat_priv->vis_hash_lock);
-
- if (bat_priv->primary_if)
- send_vis_packet(bat_priv, info);
-
- spin_lock_bh(&bat_priv->vis_hash_lock);
- send_list_del(info);
- kref_put(&info->refcount, free_info);
- }
- spin_unlock_bh(&bat_priv->vis_hash_lock);
- start_vis_timer(bat_priv);
-}
-
-/* init the vis server. this may only be called when if_list is already
- * initialized (e.g. bat0 is initialized, interfaces have been added) */
-int vis_init(struct bat_priv *bat_priv)
-{
- struct vis_packet *packet;
- int hash_added;
-
- if (bat_priv->vis_hash)
- return 1;
-
- spin_lock_bh(&bat_priv->vis_hash_lock);
-
- bat_priv->vis_hash = hash_new(256);
- if (!bat_priv->vis_hash) {
- pr_err("Can't initialize vis_hash\n");
- goto err;
- }
-
- bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
- if (!bat_priv->my_vis_info) {
- pr_err("Can't initialize vis packet\n");
- goto err;
- }
-
- bat_priv->my_vis_info->skb_packet = dev_alloc_skb(
- sizeof(struct vis_packet) +
- MAX_VIS_PACKET_SIZE +
- sizeof(struct ethhdr));
- if (!bat_priv->my_vis_info->skb_packet)
- goto free_info;
-
- skb_reserve(bat_priv->my_vis_info->skb_packet, sizeof(struct ethhdr));
- packet = (struct vis_packet *)skb_put(
- bat_priv->my_vis_info->skb_packet,
- sizeof(struct vis_packet));
-
- /* prefill the vis info */
- bat_priv->my_vis_info->first_seen = jiffies -
- msecs_to_jiffies(VIS_INTERVAL);
- INIT_LIST_HEAD(&bat_priv->my_vis_info->recv_list);
- INIT_LIST_HEAD(&bat_priv->my_vis_info->send_list);
- kref_init(&bat_priv->my_vis_info->refcount);
- bat_priv->my_vis_info->bat_priv = bat_priv;
- packet->version = COMPAT_VERSION;
- packet->packet_type = BAT_VIS;
- packet->ttl = TTL;
- packet->seqno = 0;
- packet->entries = 0;
-
- INIT_LIST_HEAD(&bat_priv->vis_send_list);
-
- hash_added = hash_add(bat_priv->vis_hash, vis_info_cmp, vis_info_choose,
- bat_priv->my_vis_info);
- if (hash_added < 0) {
- pr_err("Can't add own vis packet into hash\n");
- /* not in hash, need to remove it manually. */
- kref_put(&bat_priv->my_vis_info->refcount, free_info);
- goto err;
- }
-
- spin_unlock_bh(&bat_priv->vis_hash_lock);
- start_vis_timer(bat_priv);
- return 1;
-
-free_info:
- kfree(bat_priv->my_vis_info);
- bat_priv->my_vis_info = NULL;
-err:
- spin_unlock_bh(&bat_priv->vis_hash_lock);
- vis_quit(bat_priv);
- return 0;
-}
-
-/* Decrease the reference count on a hash item info */
-static void free_info_ref(void *data, void *arg)
-{
- struct vis_info *info = data;
-
- send_list_del(info);
- kref_put(&info->refcount, free_info);
-}
-
-/* shutdown vis-server */
-void vis_quit(struct bat_priv *bat_priv)
-{
- if (!bat_priv->vis_hash)
- return;
-
- cancel_delayed_work_sync(&bat_priv->vis_work);
-
- spin_lock_bh(&bat_priv->vis_hash_lock);
- /* properly remove, kill timers ... */
- hash_delete(bat_priv->vis_hash, free_info_ref, NULL);
- bat_priv->vis_hash = NULL;
- bat_priv->my_vis_info = NULL;
- spin_unlock_bh(&bat_priv->vis_hash_lock);
-}
-
-/* schedule packets for (re)transmission */
-static void start_vis_timer(struct bat_priv *bat_priv)
-{
- INIT_DELAYED_WORK(&bat_priv->vis_work, send_vis_packets);
- queue_delayed_work(bat_event_workqueue, &bat_priv->vis_work,
- msecs_to_jiffies(VIS_INTERVAL));
-}
diff --git a/drivers/staging/batman-adv/vis.h b/drivers/staging/batman-adv/vis.h
deleted file mode 100644
index 2c3b330..0000000
--- a/drivers/staging/batman-adv/vis.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008-2010 B.A.T.M.A.N. contributors:
- *
- * Simon Wunderlich, Marek Lindner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#ifndef _NET_BATMAN_ADV_VIS_H_
-#define _NET_BATMAN_ADV_VIS_H_
-
-#define VIS_TIMEOUT 200 /* timeout of vis packets in seconds */
-
-int vis_seq_print_text(struct seq_file *seq, void *offset);
-void receive_server_sync_packet(struct bat_priv *bat_priv,
- struct vis_packet *vis_packet,
- int vis_info_len);
-void receive_client_update_packet(struct bat_priv *bat_priv,
- struct vis_packet *vis_packet,
- int vis_info_len);
-int vis_init(struct bat_priv *bat_priv);
-void vis_quit(struct bat_priv *bat_priv);
-
-#endif /* _NET_BATMAN_ADV_VIS_H_ */
--
linux integration
1
0
linux integration; tag, DaveM-20101220, created. v2.6.37-rc2-819-gc47bc5f
by postmaster＠open-mesh.org 20 Dec '10
by postmaster＠open-mesh.org 20 Dec '10
20 Dec '10
The tag, DaveM-20101220 has been created
at c47bc5fe23690bc61533074bb44936efd40ee837 (commit)
- Shortlog ------------------------------------------------------------
commit c47bc5fe23690bc61533074bb44936efd40ee837
Merge: 3d46bb9 0e15fe7
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Dec 20 16:16:37 2010 +0100
Merge remote branch 'origin/next' into linux
-----------------------------------------------------------------------
--
linux integration
1
0
linux integration; branch, for-david, created. v2.6.37-rc1-1723-gc6c8fea
by postmaster＠open-mesh.org 20 Dec '10
by postmaster＠open-mesh.org 20 Dec '10
20 Dec '10
The branch, for-david has been created
at c6c8fea29769d998d94fcec9b9f14d4b52b349d3 (commit)
- Shortlog ------------------------------------------------------------
commit c6c8fea29769d998d94fcec9b9f14d4b52b349d3
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Dec 13 11:19:28 2010 +0000
net: Add batman-adv meshing protocol
B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing
protocol for multi-hop ad-hoc mesh networks. The networks may be wired or
wireless. See http://www.open-mesh.org/ for more information and user space
tools.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b236da6931e2482bfe44a7865dd4e7bb036f3496
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Dec 14 03:09:15 2010 +0000
net: use NUMA_NO_NODE instead of the magic number -1
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit caafa84251b886feb6cdf23d50e2cc99dcdaaaf3
Author: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Date: Sun Dec 12 19:04:43 2010 +0000
bonding: add the debugfs interface to see RLB hash table
This patch provices the debugfs interface to see RLB hash table
like the following:
# cat /sys/kernel/debug/bonding/bond0/rlb_hash_table
SourceIP DestinationIP Destination MAC DEV
10.124.196.205 10.124.196.205 ff:ff:ff:ff:ff:ff eth4
10.124.196.205 10.124.196.81 00:19:99:XX:XX:XX eth3
10.124.196.205 10.124.196.1 00:21:d8:XX:XX:XX eth0
This is helpful to check if the receive load balancing works as expected.
Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 411204a5a1ec1a35363d8ef450c77e2b8235da4d
Author: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Date: Sun Dec 12 19:03:24 2010 +0000
bonding: migrate some macros from bond_alb.c to bond_alb.h
This patch simply migrates some macros from bond_alb.c to bond_alb.h.
Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ad6bad3efbb82206837daad8cba2bc9343d778bf
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:55 2010 +0000
cxgb4: NUMA-aware Tx queue allocations
Allocate Tx queue memory on the node indicated by the new
netdev_queue_numa_node_read.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 23d88e1d3e4a5b807ce6725f9294b7b9dfcd89a1
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:54 2010 +0000
cxgb4: extend VPD parsing
Current code parses the VPD RO section for keywords but makes static
assumptions about the location of the section. Remove them and parse
the VPD to find it.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 005b5717faac22264c1f61908ec5ac5b98108d99
Author: Joe Perches <joe(a)perches.com>
Date: Tue Dec 14 21:36:53 2010 +0000
cxgb4: add const to static arrays
Patch originally from Joe Perches, unmodified.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8f3a76769ee50a839282f70d07d5f3429524b68a
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:52 2010 +0000
cxgb4: remove a bitmap
The driver keeps a bitmap of the netdevs it registered so it knows what to
unregister later. Remove that and look at reg_state instead.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b1a3c2b698ec333edc86bf8b5a636162ca309870
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:51 2010 +0000
cxgb4: remove the name field from the adapter structure
Remove a field the driver uses to keep track of the name of the first
netdev it manages to register. Do this by changing the registration
loop to stop the first time it fails so the first registered device is
trivial to tell.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ba27816cd8167c64652406d86ca78bcc5989f20f
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:50 2010 +0000
cxgb4: correct formatting of MSI-X interrupt names
The last byte of the buffer for MSI-X names could not be used due to a
bogus -1. Also do not explicitly clear the last byte, snprintf will do
the right thing.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8cd18ac47f9642bcd0d30d4b3521359b1896c208
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:49 2010 +0000
cxgb4: allocate more space for MSI-X interrupt names
Currently MSI-X names for netdevs with long names are truncated in
/proc/interrupts due to insufficient space. Use IFNAMSIZ to size the
needed space.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 118969ed21b6895045b0a5a8a32feac1c9341096
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:48 2010 +0000
cxgb4: print port information after registering each netdev
Print information about each port when its netdev is registered instead
of looping separately over the ports at the end. The bulk of this patch
is due to indentation change.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7d5e77aafa39f3210b6273a44fe07508e837c3cb
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:47 2010 +0000
cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports
And fix the supported flags ethtool reports for the two cases.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a57cabe09f843a3f71277c485494496b3b9ee84a
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:46 2010 +0000
cxgb4: set the number of queues before device registration
The number of queues is known early, move the calls to
netif_set_real_num_[rt]x_queues before register_netdev.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ec16400823ce63bc0cfe89df78c6b7bf4a4d684b
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:45 2010 +0000
cxgb4: do not read the clock frequency from VPD
No need to read the clock frequency from VPD, we already get it a bit
later from FW, after any potential adjustments.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ef306b50b983be4873aed453c1feeaab22f3a098
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:44 2010 +0000
cxgb4: enable PCIe relaxed ordering
Enable relaxed ordering for descriptor reads and packet I/O.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 986d730a696277520084180071ac4873aac63905
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:50 2010 +0000
bnx2x: update version to 1.62.00-2
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b0200e250b5eef29e5ed8aa17979499affcc11cd
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 22:34:37 2010 +0200
bnx2x: remove old FW files
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5928c8baf67a36f553fe23a1b7820c7745e8bb2e
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:35 2010 +0000
bnx2x: replace FW to 6.2.5
Includes FCoE releated fixes in FW flows
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 40392d4e49c29bf5e939803d804dc8c7b600f297
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 22:28:42 2010 +0200
bnx2x: add FW 6.2.5 files
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bcab15c5d780bafb38311f00fcb263d03d2b00f1
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:25 2010 +0000
bnx2x: Add DCB/PFC support - link layer
Add appropriate HW DCB/PFC configuration
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e4901dde12d92b70dd13fa8b3bbc9df7a6129aab
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:18 2010 +0000
bnx2x: add DCB support
Adding DCB initialization and handling on 57712 FW/HW
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8307fa3e86a83924dd7f8310ce1e051f34986fe8
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:09 2010 +0000
bnx2x: add a select queue callback
This callback required to allow FCoE traffic to be
sent on separate priority queue from other L2 traffic,
which is managed by PFC in HW.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr(a)broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ec6ba945211b1c1f97d3d19fe60f166c9a92241d
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:01 2010 +0000
bnx2x: add FCoE ring
Includes new driver structures and FW/HW configuration for FCoE ring
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr(a)broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a3d22a68d752ccc1a01bb0a64dd70b7a98bf9e23
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 06:27:10 2010 +0000
bnx2x: Take the distribution range definition out of skb_tx_hash()
Move the calcualation of the Tx hash for a given hash range into a separate
function and define the skb_tx_hash(), which calculates a Tx hash for a
[0; dev->real_num_tx_queues - 1] hash values range, using this
function (__skb_tx_hash()).
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d33e455337ea2c71d09d7f4367d6ad6dd32b6965
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Dec 14 13:01:14 2010 -0800
net: Abstract default MTU metric calculation behind an accessor.
Like RTAX_ADVMSS, make the default calculation go through a dst_ops
method rather than caching the computation in the routing cache
entries.
Now dst metrics are pretty much left as-is when new entries are
created, thus optimizing metric sharing becomes a real possibility.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9fe146aef44afe5ec677d8150b6ae94e09b773f7
Merge: 6389aa7 4e53f78
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Dec 14 11:33:23 2010 -0800
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
commit 6389aa73ab8c15084fce18307a8e198eaff818da
Merge: 0dbaee3 1d212aa
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Dec 14 10:52:54 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Dec 13 12:52:14 2010 -0800
net: Abstract default ADVMSS behind an accessor.
Make all RTAX_ADVMSS metric accesses go through a new helper function,
dst_metric_advmss().
Leave the actual default metric as "zero" in the real metric slot,
and compute the actual default value dynamically via a new dst_ops
AF specific callback.
For stacked IPSEC routes, we use the advmss of the path which
preserves existing behavior.
Unlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates
advmss on pmtu updates. This inconsistency in advmss handling
results in more raw metric accesses than I wish we ended up with.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cc6f02dd490dac4ad821d5077b934c9b37037cd0
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Dec 13 12:50:49 2010 -0800
net: change ip_default_ttl documentation
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cfb7e5f187e787bb1430decea339fdea6a669f92
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:26 2010 +0000
pch_can: Replace netif_rx to netif_receive_skb
Since this driver is implemented as NAPI,
netif_receive_skb must be used not netif_rx.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0c78ab76a05cd788af0383354ffe819e0617f6a0
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:25 2010 +0000
pch_can: Add setting TEC/REC statistics processing
Add setting TEC/REC statistics processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fea9294c5f2902c45613681ad995ca27899d2016
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:24 2010 +0000
pch_can: Optimize "if" condition in rx/tx processing
For reduce "if" condition, easy to read/understand the code,
optimize "if" condition in rx/tx processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3332bc5446e034566e8a56bf7a7cd479ca35bd6d
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:23 2010 +0000
pch_can: Fix incorrect return processing
Fix incorrect return processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a6f6d6b51b110e661ae5f862d60c27da4970bec6
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:22 2010 +0000
pch_can: Move MSI processing to probe/remove processing
Currently, in case this driver is integrated as module, and when this
module is re-installed, no interrupts is to be occurred.
For the above issue, move MSI processing to open/release processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c755145649fa73bd197ac1a73d141047c61b543a
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:21 2010 +0000
pch_can: Comment optimization
Comment optimization
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d06848be64e13d5d1d73e581fb185e815893d8b7
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:20 2010 +0000
pch_can: Fix miss-setting status issue
Modify miss-setting status issue at suspend.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0e0805c4063d0611e282bb7fdebe2e223bfe7220
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:19 2010 +0000
pch_can: Fix bit timing calculation issue
Modify like use calculated value directly passed by CAN core module.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8714fcaca63203fe10331fe530ff48d3dd31de4e
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:18 2010 +0000
pch_can: Delete unnecessary/redundant code
Delete unnecessary/redundant code
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9388b166a323f8f7e35eb7a0d17b297ca695fa91
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:17 2010 +0000
pch_can: Fix coding rule violation
Fix coding rule violation.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 435b4efe93d4cec3aa0b36e8707df8d292d3641b
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:16 2010 +0000
pch_can: Replace netdev_dbg instead of dev_dbg partly
For easy to readable, use netdev_dbg instead of dev_dbg partly
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e91530ea959295a31911488c62088d5c372032ea
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:15 2010 +0000
pch_can: Change Copyright and module description
Currently, Copyright and module description are not formal.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 44c9aa890a2587f48920485b7487bc6d516dbbdf
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:14 2010 +0000
pch_can: Reduce register access
For improve tx/rx speed, reduce register access.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca2b004e89484e89b1815157fae2d7f933c5af9e
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:13 2010 +0000
pch_can: Change functions type
Currently, these two functions spec(returned value) is unnatural.
Thus, change the return value's spec
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bd58cbc322e97550af5e12584324b7117180435d
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:12 2010 +0000
pch_can: Rename function/macro name
For easy to read/understand, Rename function/macro name.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7f2bc50efeaeb1dff62ef7e128ae36499fbcf35d
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:11 2010 +0000
pch_can: Fix warnings
Currently, in case CONFIG_PM is disabled, compiler outputs warnings.
Move six functions which are used only CONFIG_PM is enabled,
into "#ifdef CONFIG_PM" area.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d5b4b2778e8e40f42ae5d9556777583f3556d81
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:10 2010 +0000
pch_can: Improve rx processing
Replace complex "goto" to "do~while".
For easy to read/understand, it divides a rx function into some functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8ac9702b9d5d81b819fc7d6b4f6abad22af01f3c
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:09 2010 +0000
pch_can: Fix endianness issue
there is endianness issue both Tx and Rx.
Currently, data is set like below.
Register:
MSB--LSB
x x D0 D1
x x D2 D3
x x D4 D5
x x D6 D7
But Data to be sent must be set like below.
Register:
MSB--LSB
x x D1 D0
x x D3 D2
x x D5 D4
x x D7 D6 (x means reserved area.)
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e489ccebf14657774fd877dc841b458703730586
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:08 2010 +0000
pch_can: Divide poll function
To easy to read/understand, divide poll function into two sub-functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 76d94b232940ca91e9b26c590cb7312ab88ff722
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:07 2010 +0000
pch_can: Add flow control processing
Currently, there is no flow control processing.
Thus, Add flow control processing as
when there is no empty of tx buffer,
netif_stop_queue is called.
When there is empty buffer, netif_wake_queue is called.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d212aa96e1b63459486f729af9a3fa38768b801
Merge: 8c4877a b761337
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Dec 13 15:20:45 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 249fab773dd5f689318c969ed649c4db077cdfc3
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Dec 13 12:16:14 2010 -0800
net: add limits to ip_default_ttl
ip_default_ttl should be between 1 and 255
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8c4877a4128e7931077b024a891a4b284d8756a3
Author: Joe Perches <joe(a)perches.com>
Date: Mon Dec 13 10:05:14 2010 -0800
ehea: Use the standard logging functions
Remove ehea_error, ehea_info and ehea_debug macros.
Use pr_fmt, pr_<level>, netdev_<level> and netif_<level> as appropriate.
Fix messages to use trailing "\n", some messages had an extra one
as the old ehea_<level> macros added a trailing "\n".
Coalesced long format strings.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 323e126f0c5995f779d7df7fd035f6e8fed8764d
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:55:08 2010 -0800
ipv4: Don't pre-seed hoplimit metric.
Always go through a new ip4_dst_hoplimit() helper, just like ipv6.
This allowed several simplifications:
1) The interim dst_metric_hoplimit() can go as it's no longer
userd.
2) The sysctl_ip_default_ttl entry no longer needs to use
ipv4_doint_and_flush, since the sysctl is not cached in
routing cache metrics any longer.
3) ipv4_doint_and_flush no longer needs to be exported and
therefore can be marked static.
When ipv4_doint_and_flush_strategy was removed some time ago,
the external declaration in ip.h was mistakenly left around
so kill that off too.
We have to move the sysctl_ip_default_ttl declaration into
ipv4's route cache definition header net/route.h, because
currently net/ip.h (where the declaration lives now) has
a back dependency on net/route.h
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a02e4b7dae455151c423e2f69ef222c502a321fd
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:39:02 2010 -0800
ipv6: Demark default hoplimit as zero.
This is for consistency with ipv4. Using "-1" makes
no sense.
It was made this way a long time ago merely to be consistent
with how the ipv6 socket hoplimit "default" is stored.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5170ae824ddf1988a63fb12cbedcff817634c444
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:35:57 2010 -0800
net: Abstract RTAX_HOPLIMIT metric accesses behind helper.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit abbf46ae0e4954584eac599bec73502c1c805e9e
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:14:46 2010 -0800
ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1635953305694ece16d99078ca6d32f3d4e7eb36
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:15 2010 +0100
hostap: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. Drop flush_scheduled_work()
from prism2_free_local_data() and replace it with explicit flushing of
work items on the respective free functions. Work items in ap_data
are flushed from hostap_free_data() and the ones in local_info from
prism2_free_local_data().
Flush is used instead of cancel as some process and free items from
queue.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Jes Sorensen <jes(a)trained-monkey.org>
Cc: netdev(a)vger.kernel.org
commit 781ba4567698be9db7ca94d827c4b38d8583c168
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
i2400m: drop i2400m_schedule_work()
i2400m implements dynamic work allocation and queueing mechanism in
i2400_schedule_work(); however, this is only used for reset and
recovery which can be served equally well with preallocated per device
works.
Replace i2400m_schedule_work() with two work structs in struct i2400m.
These works are explicitly canceled when the device is released making
calls to flush_scheduled_work(), which is being deprecated,
unnecessary.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez(a)intel.com>
Cc: linux-wimax(a)intel.com
Cc: netdev(a)vger.kernel.org
commit fe8998c5e3b173f3d5c450bbde6173e7fbe5158d
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
sungem: update gp->reset_task flushing
gp->reset_task_pending is always set right before reset_task is
scheduled and as there is no synchronization between the setting and
scheduling, busy looping on reset_task_pending before flushing
reset_task doesn't really buy anything.
Directly flush gp->reset_task on suspend and cancel on detach.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: netdev(a)vger.kernel.org
commit 760141a53e5d72d4cc1d8c6e2a0232a24bedb36b
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
igb[v],ixgbe: don't use flush_scheduled_work()
All three drivers use flush_scheduled_work() similarly during driver
detach. Replace it with explicit cancels.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: e1000-devel(a)lists.sourceforge.net
Cc: netdev(a)vger.kernel.org
commit 9beb4896cec71e40738a7752072174fbf0d5b7b4
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
iseries_veth: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. Remove its usage from
iseries_veth.
* Cancelling a delayed work, queueing it for immediate execution if
cancelled and then waiting for completion can be done by simply
calling flush_delayed_work_sync().
* Explicitly cancel cnx->statemachine_wq on module unload.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Santiago Leon <santil(a)linux.vnet.ibm.com>
Cc: netdev(a)vger.kernel.org
commit f5c35cc191afd08d660e6db0fecc9f431dc8f273
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
ehea: don't use flush_scheduled_work()
Directly cancel port->reset_task from ehea_shutdown_single_port()
instead. As this cancels the work for each port on driver detach,
flushing system_wq from ehea_remove() or ehea_module_exit() is no
longer necessary.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Cc: netdev(a)vger.kernel.org
commit 3d6b892bcc4c810071e36d8aff25aa171f55f93d
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
ehea: kill unused ehea_rereg_mr_task
ehea_rereg_mr_task is not used. Remove it and drop @work parameter
from ehea_rereg_mrs().
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Cc: netdev(a)vger.kernel.org
commit 23f333a2bfafba80339315b724808982a9de57d9
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
drivers/net: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. This patch contains simple
conversions to replace flush_scheduled_work() usage with direct
cancels and flushes.
Directly cancel the used works on driver detach and flush them in
other cases.
The conversions are mostly straight forward and the only dangers are,
* Forgetting to cancel/flush one or more used works.
* Cancelling when a work should be flushed (ie. the work must be
executed once scheduled whether the driver is detaching or not).
I've gone over the changes multiple times but it would be much
appreciated if you can review with the above points in mind.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Jay Cliburn <jcliburn(a)gmail.com>
Cc: Michael Chan <mchan(a)broadcom.com>
Cc: Divy Le Ray <divy(a)chelsio.com>
Cc: e1000-devel(a)lists.sourceforge.net
Cc: Vasanthy Kolluri <vkolluri(a)cisco.com>
Cc: Samuel Ortiz <samuel(a)sortiz.org>
Cc: Lennert Buytenhek <buytenh(a)wantstofly.org>
Cc: Andrew Gallatin <gallatin(a)myri.com>
Cc: Francois Romieu <romieu(a)fr.zoreil.com>
Cc: Ramkrishna Vepa <ramkrishna.vepa(a)exar.com>
Cc: Matt Carlson <mcarlson(a)broadcom.com>
Cc: David Brownell <dbrownell(a)users.sourceforge.net>
Cc: Shreyas Bhatewara <sbhatewara(a)vmware.com>
Cc: netdev(a)vger.kernel.org
commit 6e07ebd84eef00be9e169a6d15a0bc20b06578fa
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
drivers/net: remove unnecessary flush_scheduled_work() calls
janz-ican3, sh_eth, skge and vxge don't use workqueue at all and there
is no reason to flush the system_wq. Drop flush_scheduled_work()
calls and references to workqueue.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Wolfgang Grandegger <wg(a)grandegger.com>
Cc: Stephen Hemminger <shemminger(a)linux-foundation.org>
Cc: Ramkrishna Vepa <ramkrishna.vepa(a)exar.com>
Cc: Sivakumar Subramani <sivakumar.subramani(a)exar.com>
Cc: Sreenivasa Honnur <sreenivasa.honnur(a)exar.com>
Cc: Jon Mason <jon.mason(a)exar.com>
Cc: netdev(a)vger.kernel.org
commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0
Author: Manuel Lauss <manuel.lauss(a)googlemail.com>
Date: Sat Dec 11 09:53:42 2010 +0000
net: au1000_eth: remove unused global variable.
The driver global au_macs[] is unused in the entire kernel tree,
so remove it.
Signed-off-by: Manuel Lauss <manuel.lauss(a)googlemail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 85a564983aff948b9ea8b6e734b3e80b5755d12a
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:04 2010 +0000
s2io: Using static const generally increases object text and decreases data size. It also generally decreases overall object size.
text data bss dec hex filename
109387 389 24432 134208 20c40 drivers/net/s2io.o.old
109358 389 24432 134179 20c23 drivers/net/s2io.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 11410b62cf9bdaed5863696c7994286a900424c7
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:03 2010 +0000
s2io: Update Driver Version
Update Driver Version
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c0dbf37e78c5c1e3e6cfeb39de30518fdde33e83
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:02 2010 +0000
s2io: make strings at tables const
Put immutable data in read/only section.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1853e2e15dc95ff3430530941b5856581251ef70
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:01 2010 +0000
s2io: rx_ring_sz bounds checking
modparm rx_ring_sz can be set to be greater than the maximum allowable
number of blocks. This results in an array overrun when probing the
driver, and causes memory corruption.
Also, the MAX_RX_DESC_1 multiply the max number of rings by max number
of blocker per ring by 127, but the driver does the same calculation
with 127+1. This results in the possibility of the value being set
being larger than the maximum allowable value.
Finally, clean-up the s2io_ethtool_gringparam code to be more
intuitive.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9835fd7321a67feba6432e63bf2cba43f5a56bd9
Author: Carolyn Wyborny <carolyn.wyborny(a)intel.com>
Date: Mon Nov 22 17:17:21 2010 +0000
igb: Add new function to read part number from EEPROM in string format
New adapters will have part numbers stored in string format rather than
simple hex format. This function will read part number formats in either
hex or string.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c920aa8b87bfec3dbd926ae777430e613e5088df
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Dec 1 08:45:24 2010 +0000
e1000e: increment the driver version
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 61c758166701c4f156c0aba10260f5729b1a6f43
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Thu Dec 9 23:04:25 2010 +0000
e1000e: static analysis tools complain of a possible null ptr p dereference
Adding this default case resolves the issue.
v2- Removed "break" in default case based on feedback
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e9262447233037e9336d5866628821156a17366f
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:02:06 2010 +0000
e1000e: minor error message corrections
Correct error messages when setting up Rx resources and when checking
module parameters.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 36b973df713e1395b79896de667ad7dbb1925fa7
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 07:42:43 2010 +0000
e1000e: prevent null ptr dereference in e1000_tx_queue()
tx_desc can be dereferenced as a null pointer when count is passed in
as 0.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 073287c037083497ebaaf75ead469b769f218615
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:51 2010 +0000
e1000e: support new PBA format from EEPROM
Provide support to e1000e for displaying the new format of the PBA found
in the EEPROM. The unique PBA identifier is no longer restricted to
hexadecimal numbers and must now be read and displayed as a string.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 664dc878ed6f0476b875547547a49e06f7a4e73b
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:46 2010 +0000
e1000e: 82579 PHY incorrectly identified during init
During init, reading the 2 PHY ID registers back-to-back in the default
fast mode could return invalid data (all F's) and in slow mode could
return data to the second read the data from the first read. To resolve
the issue in fast mode, set to slow mode before any PHY accesses; to
resolve the issue in slow mode, put in a delay for every 82579 PHY access.
Since this PHY is currently only paired with the pch2lan MAC and the PHY
type is not known before the first PHY access which can fail this way,
check for this based on MAC-type.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ce54afd16d874ac07378a8bb55d26f7f5b613c0e
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:41 2010 +0000
e1000e: 82577/8/9 mis-configured OEM bits during S0->Sx
The LPLU (Low Power Link Up) and Gigabit Disable bits (a.k.a. OEM bits)
were being configured incorrectly when device goes to D3 state.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d9c76f99c2a79feb413e3e751362d59c0f5323f6
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:35 2010 +0000
e1000e: 82571 Serdes can fail to get link
When link partner is sending continuous Config symbols, the 82571 Serdes
FIFO can overflow resulting in Invalid bit getting set. To resolve this,
if Sync and Config bits are both 1 ignore the Invalid bit and restart
auto-negotiation.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit cbd006cb7d4e7b76c6febf7f51e970bced132914
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:30 2010 +0000
e1000e: 82577/8 must acquire h/w semaphore before workaround
The workaround function e1000_configure_k1_pchlan() assumes the h/w
semaphore is already acquired. This was originally missed when setting up
the part for the ethtool loopback test.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ed5c2b0b78e5467f7948bef92b21f3c76823f392
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:25 2010 +0000
e1000e: 82574/82583 performance improvement
Increasing the transmit fifo by 4K (by decreasing the receive fifo size
specified in .pba by the same amount) increases Tx performance.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a82a14f4cdcfedb27eacec8eb4d9e47d42c10d43
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:20 2010 +0000
e1000e: 82571-based mezzanine card can fail ethtool link test
On certain 82571-based mezzanine NICs in some blade servers, the ethtool
link test can fail due to the serdes_has_link flag not set correctly.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9633e63bb1d82c02950983d5d3317e6656b11c8e
Author: Holger Eitzenberger <holger(a)eitzenberger.org>
Date: Wed Nov 17 15:43:52 2010 +0000
e1000e: fix double initialization in blink path
The kernel goes BUG() at the time 'ethtool -p eth0 3' comes
back, which is due to adapter->led_blink_task initialized
several times. At the time it is still running this results
in a corrupted task_list of the associated workqueue.
The fix is to move the workqueue initialization to the
probe function instead.
Signed-off-by: Holger Eitzenberger <holger(a)eitzenberger.org>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9fe93afdd07aba52a018eb52784124579a80470e
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 09:33:54 2010 +0000
ixgbe: cleanup string function calls to use bound checking versions.
Some minor cleanup to use string calls that use bound checks just to
be extra safe.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5136cad37b276e3e11c4f8ad0bcf9cb2eec0e5af
Author: Emil Tantilov <emil.s.tantilov(a)intel.com>
Date: Wed Dec 1 05:47:05 2010 +0000
ixgbe: fix ntuple support
commit f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef
ixgbe: Update ixgbe to use new vlan accleration.
removed ETH_FLAG_NTUPLE from the supported flags.
This patch puts it back on to allow for setting ntuple via ethtool.
CC: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d994653db465616a7bf27703e733170c47488cdf
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Thu Dec 9 06:55:19 2010 +0000
ixgbe: fix X540 to use it's own info struct
This patch enables X540 hardware to use it's own set of support
functions. This is useful as it has no need of SFP+ support. A
couple minor bugs with the eeprom semaphore were also cleaned up.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 2b264909c660717a67da997a181a4a4f551ef9b6
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Thu Dec 9 06:55:14 2010 +0000
ixgbe: fix X540 phy id to correct value
The existing PHY ID for X540 was from early production hardware and
is no longer correct. This patch corrects that.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ae54496f9e8d40c89e5668205c181dccfa9ecda1
Author: Emil Tantilov <emil.s.tantilov(a)intel.com>
Date: Sat Dec 4 05:35:17 2010 +0000
ixgb: Don't check for vlan group on transmit
Based on a patch from Jesse Gross.
Enable vlan tag insertion even when vlan group is not configured.
For ixgb HW both CTRL0.VME and VLE bit in the Tx descriptor need to be set
in order to enable HW acceleration.
Introduced separate functions for enabling/disabling of vlan tag stripping
similar to ixgbe.
CC: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 667445008db3f45a760c235d771be0c9671e59e5
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Wed Dec 1 19:59:50 2010 +0000
Intel Wired LAN drivers: Use static const
Based on work by Joe Perches <joe(a)perches.com>
Using static const to decrease data and overall object size.
CC: Joe Perches <joe(a)perches.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
commit 19a0b67afd174c4db261d587b5c67704dcd53c17
Author: Dean Nelson <dnelson(a)redhat.com>
Date: Thu Nov 11 05:50:25 2010 +0000
e1000: fix return value not set on error
Dean noticed that 'err' wasn't being set when the "goto err_dma"
statement is executed in the following hunk from the commit. It's value
will be zero as a result of a successful call to e1000_init_hw_struct().
This patch changes the error condition to be correctly propagated.
CC: stable(a)kernel.org
Signed-off-by: Dean Nelson <dnelson(a)redhat.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit fa795e6b9c59a14c80a475428df7e4cb97396f47
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Fri Dec 10 00:09:08 2010 -0800
MAINTAINERS: Update Intel Wired LAN info
Update with Intel Wired Ethernet public git trees.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit dabee56860bc6b617c7ea481bb9b00fba41c9c48
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Fri Dec 10 00:01:44 2010 -0800
Documentation/networking/ixgbevf.txt: Update documentation
Update Intel Wired LAN ixgbevf documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 872857a84e18f4bf9b56b298309a977b2ce77b5b
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:55:47 2010 -0800
Documentation/networking/ixgbe.txt: Update ixgbe documentation
Update Intel Wired LAN ixgbe documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit f2be1429798785c6b7d4747ac1fda2c40b3f26eb
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:49:34 2010 -0800
Documentation/networking/igbvf.txt: Update documentation
Update Intel Wired LAN igbvf documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 1ffd7246445038569f4c2f4b39bda1e71e68f1a2
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:47:39 2010 -0800
Documentation/networking/igb.txt: update documentation
Update Intel Wired LAN igb documentation.
v2- Updated the ethtool support link, removed the LRO section and
anti-spoofing sections.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 072ed34fa97374b390a2493fa281ec8a7888b312
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:44:42 2010 -0800
Documentation/networking/e1000e.txt: Update documentation
Update Intel Wired LAN e1000e documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 96c3c0330dea8856f02fc59e25c866d6d5eebed5
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:42:00 2010 -0800
Documentation/networking/e1000.txt: Update documentation
Update Intel Wired LAN e1000 documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a5d62a149bb8f5359aff7ed7dce339752fbabfd9
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 16:49:24 2010 -0800
isdn: Fix printed out copy_from_user() return value after previous change.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f073c7ca29a4a7e14060d9d3ddf09bfbb7cd9cc0
Author: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Date: Thu Dec 9 15:17:13 2010 +0000
bonding: add the debugfs facility to the bonding driver
This patch provides the debugfs facility to the bonding driver.
The "bonding" directory is created in the debugfs root and directories of
each bonding interface (like bond0, bond1...) are created in that.
# mount -t debugfs none /sys/kernel/debug
# ls /sys/kernel/debug/bonding
bond0 bond1
Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6c2c9d964e71770e7d6efc1a82f3621005d12185
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Fri Dec 10 12:02:33 2010 +0000
enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 36accaed22347f4b09cbc3c9fe2c1163a3575ea1
Author: Dan Carpenter <error27(a)gmail.com>
Date: Fri Dec 10 02:40:09 2010 +0000
isdn: return -EFAULT if copy_from_user() fails
We should be returning -EFAULT here.
Mostly this patch is to silence a smatch warning. The upper levels
of this driver turn all non-zero return values from isar_load_firmware()
into 1.
Signed-off-by: Dan Carpenter <error27(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5d52040d4d1eabb56a4d51b760ab8f74eabb9001
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:03:02 2010 +0000
vxge: update driver version
Update vxge driver version to 2.5.1
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b55e7b153f698bb027102759388d0c09542f68bd
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:03:01 2010 +0000
vxge: independent interrupt moderation
Configure the workload clock register and TIM register for independent
interrupt moderation based on the individual vpath utilization instead
of common link utilization. This greatly improves latency.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9c1638871671721e8f3693a0dfbb0e2e05b08742
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:03:00 2010 +0000
vxge: hotplug stall
When hot-unplugging a vxge adapter while running, the driver's remove
routine prints warning and then stalls the calling thread. This is due
to vxge_remove calling vxge_device_unregister to unregister the netdev
before calling flush_scheduled_work clear any pending work. Swapping
the order of these two functions resolves the issue.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2e41f6449c561e6e3f572e11d0f2240bd51104db
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:59 2010 +0000
vxge: transmit timeout deadlock
Use a workqueue to handle the device reset during a transmit timeout, as
there can be a deadlock during bringup. Also, set the netif carrier off
before the watchdog reset is started to prevent the timeout from
reoccurring while still processing the first.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:58 2010 +0000
vxge: use pci_request_region()
Only BAR0 is ever accessed, thus making the calls to pci_request_regions
overkill. Change calls of pci_request_regions to pci_request_region to
reduce the size of the mapped area.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c92bf70dcb9d08f821e4c9f09f8fc328495ba998
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:57 2010 +0000
vxge: fix crash of VF when unloading PF
Calling pci_disable_sriov when unloading a SR-IOV physical function
driver from a host when a guest is using a virtual function from that
device can cause a host crash or VM crash. The crash is caused by the
virtual config space no longer being present when PF is removed (due to
the pci_disable_sriov). This can be avoided by not calling
pci_disable_sriov to disable the PCI space when shutting down the PF.
Each function in the X3100 operates independently and in this case will
operate properly in the absence of the PF.
Also, added improved logic in the detection of SR-IOV initialization.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 528f727279ae840db8a06c94f5e82cdaeb00da6f
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:56 2010 +0000
vxge: code cleanup and reorganization
Move function locations to remove the need for internal declarations and
other misc clean-ups.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Arpit Patel <arpit.patel(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit deef4b522b814593407cfd56216840c2b75e9f15
Author: Herbert Xu <herbert(a)gondor.apana.org.au>
Date: Thu Dec 9 17:38:11 2010 +0000
bridge: Use consistent NF_DROP returns in nf_pre_routing
The nf_pre_routing functions in bridging have collected two
distinct ways of returning NF_DROP over the years, inline and
via goto. There is no reason for preferring either one.
So this patch arbitrarily picks the inline variant and converts
the all the gotos.
Also removes a redundant comment.
Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c053fd96d0d3d18c721f880b8fdd0b925894d9c4
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Dec 10 16:02:20 2010 -0800
af_packet: use swap() instead of the open coded macro XC()
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ed4ba4b5b96742d29225308ccccbdb1810b63064
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 9 12:10:25 2010 +0000
netdev: Use default implementation of ethtool_ops::get_link where possible
Various drivers are using implementations of ethtool_ops::get_link
that are equivalent to the default ethtool_op_get_link(). Change
them to use that instead.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e596e6e4d578f2639416e620d367a3af34814a40
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 9 12:08:35 2010 +0000
ethtool: Report link-down while interface is down
While an interface is down, many implementations of
ethtool_ops::get_link, including the default, ethtool_op_get_link(),
will report the last link state seen while the interface was up. In
general the current physical link state is not available if the
interface is down.
Define ETHTOOL_GLINK to reflect whether the interface *and* any
physical port have a working link, and consistently return 0 when the
interface is down.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 29639059a0122d95b34b5475bd9fee3910b401a3
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Wed Dec 8 13:54:03 2010 +0000
enic: Use VF mac set by IFLA_VF_MAC in port profile provisioning data
This patch adds support in enic 802.1Qbh port profile provisioning code
to use the mac address set by IFLA_VF_MAC. For now we handle this mac as a
special case for a VM mac address sent to us by libvirt. The VM mac address
is sent to the switch along with the rest of the port profile provisioning
data. This patch also adds calls to register and deregister the mac address
during port profile association/deassociation.
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Wed Dec 8 13:53:58 2010 +0000
enic: Add ndo_set_vf_mac support for enic dynamic devices
This patch implements the ndo_set_vf_mac netdev operation for enic
dynamic devices. It treats the mac address set by IFLA_VF_MAC as a
special case to use it in the port profile provisioning data.
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 319d7e847355ec7e03d3c865917b2b0e2e592fb8
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Wed Dec 8 13:19:58 2010 +0000
enic: Add ndo_set_rx_mode support for enic vnics
Add ndo_set_rx_mode support to register unicast and multicast
address filters for enic devices
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a8d764b9832d3cc86019f71916665dd2d337d7c2
Author: Junchang Wang <junchangwang(a)gmail.com>
Date: Wed Dec 8 16:55:16 2010 +0000
pktgen: adding prefetchw() call
We know for sure pktgen is going to write skb->data right after
*_alloc_skb, causing unnecessary cache misses.
Idea is to add a prefetchw() call to prefetch the first cache line
indicated by skb->data. On systems with Adjacent Cache Line Prefetch,
it's probably two cache lines are prefetched.
With this patch, pktgen on Intel SR1625 server with two E5530
quad-core processors and a single ixgbe-based NIC went from 8.63Mpps
to 9.03Mpps, with 4.6% improvement.
Signed-off-by: Junchang Wang <junchangwang(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4afb7527ac8cc7bd8f03570e12f6eed0eca03363
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Dec 6 12:33:01 2010 +0000
sfc: convert references to LRO to GRO
This driver now uses Generic Receive Offload, not the older LRO.
Change references to LRO in names and comments.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Acked-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 376d940ee91318cc6becefbb9454bb4454d7473f
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 9 04:37:48 2010 +0000
inet6: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0e51d67ebb8e109a0990a13dafa937fb469aa3fb
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 9 04:50:22 2010 +0000
stmmac: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 040253c931e336360453c8d81f76d1b010b2b5e7
Author: Martin Willi <martin(a)strongswan.org>
Date: Wed Dec 8 04:37:51 2010 +0000
xfrm: Traffic Flow Confidentiality for IPv6 ESP
Add TFC padding to all packets smaller than the boundary configured
on the xfrm state. If the boundary is larger than the PMTU, limit
padding to the PMTU.
Signed-off-by: Martin Willi <martin(a)strongswan.org>
Acked-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d979e20f2b9f8a50c8d5f889e0b5d78580440d1f
Author: Martin Willi <martin(a)strongswan.org>
Date: Wed Dec 8 04:37:50 2010 +0000
xfrm: Traffic Flow Confidentiality for IPv4 ESP
Add TFC padding to all packets smaller than the boundary configured
on the xfrm state. If the boundary is larger than the PMTU, limit
padding to the PMTU.
Signed-off-by: Martin Willi <martin(a)strongswan.org>
Acked-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 35d2856b4693e8de5d616307b56cef296b839157
Author: Martin Willi <martin(a)strongswan.org>
Date: Wed Dec 8 04:37:49 2010 +0000
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
The XFRMA_TFCPAD attribute for XFRM state installation configures
Traffic Flow Confidentiality by padding ESP packets to a specified
length.
Signed-off-by: Martin Willi <martin(a)strongswan.org>
Acked-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 957fca95e3521e471aac4c2e4cfbc21f399bdd84
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Sat Dec 4 15:01:52 2010 +0000
ifb: use the lockless variants of skb_queue
rq and tq are both protected by tx queue lock, so we can simply use
the lockless variants of skb_queue.
skb_queue_splice_tail_init() is used instead of the open coded and slow
one.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi(a)cyberus.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c6350362cbb19882ba0eb3578cc1abc07e6ea204
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Dec 3 19:55:20 2010 +0000
ifb: remove unused macro TX_TIMEOUT
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi(a)cyberus.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1f91505025db74c261962dc16d58f79b9b0c83c
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Dec 3 19:55:19 2010 +0000
ifb: remove the useless debug stats
These debug stats are not exported, and become useless.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi(a)cyberus.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a6a5ff26975c87a97f88c6ea077c325ff20c4cf2
Author: Jan Glauber <jang(a)linux.vnet.ibm.com>
Date: Wed Dec 8 02:58:01 2010 +0000
qeth: buffer count imbalance
The used buffers counter is not incremented in case of an error so
the counter can become negative. Increment the used buffers counter
before checking for errors.
Signed-off-by: Jan Glauber <jang(a)linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 91d4576bfe87980b1b86305c29912d96b96ce98e
Author: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Date: Wed Dec 8 02:58:00 2010 +0000
qeth: l3 add vlan hdr in passthru frames
OSA l3 mode is hw accelerated VLAN only for IPv4. Take care we
add the vlan hdr to a passthru frame in the device driver.
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f154b79cd7db221240ab6e8e4d844d3a3f10b04c
Author: Einar Lueck <elelueck(a)de.ibm.com>
Date: Wed Dec 8 02:57:59 2010 +0000
qeth: support VIPA add/del in offline mode
Only work through the IP adddress to do list if the card is UP or
SOFTSETUP. Enables to configure VIPA add/del in offline mode.
Signed-off-by: Einar Lueck <elelueck(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d0ddf30fdd2b98fb547ffa33bb79a7a96ef8d7dd
Author: Einar Lueck <elelueck(a)de.ibm.com>
Date: Wed Dec 8 02:57:58 2010 +0000
qeth: support ipv6 query arp cache for HiperSockets
Function qeth_l3_arp_query now queries for IPv6 addresses, too, if
QETH_QARP_WITH_IPV6 is passed as parameter to the ioctl. HiperSockets
and GuestLAN in HiperSockets mode provide corresponding entries.
Signed-off-by: Einar Lueck <elelueck(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c07224005dd3fe746246acadc9be652a588a4d7f
Author: Jiri Pirko <jpirko(a)redhat.com>
Date: Thu Dec 9 03:40:30 2010 +0000
net/ipv6/udp.c: fix typo in flush_stack()
skb1 should be passed as parameter to sk_rcvqueues_full() here.
Signed-off-by: Jiri Pirko <jpirko(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 457de4383ec6144df7d5a82cdfb110c825305a51
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 13:16:09 2010 -0800
ipv6: Fix 'release_it' logic in tcp_v6_get_peer()
We accidently set it to "true" for the case where we
are using a route bound peer.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4c0833bcd4d302fe783b9f8286a00ca2999d6200
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Fri Dec 10 03:18:04 2010 +0000
bridge: Fix return values of br_multicast_add_group/br_multicast_new_group
If br_multicast_new_group returns NULL, we would return 0 (no error) to
the caller of br_multicast_add_group, which is not what we want. Instead
br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case.
Also propagate the error number returned by br_mdb_rehash properly.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit eaa7dcde1d092c792cbca4be81d2e506e84c6122
Merge: cf78f8e b7ec19a
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 11:22:57 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4
Merge: 1e13f86 c39d35e
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 10:20:43 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
commit 1e13f863ca88014d9550876c05c939fdab1017d1
Merge: f404c2f f435d9e
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 09:50:47 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
commit b7ec19af63b467e30189984fb24e6157603608e3
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Fri Dec 10 12:49:23 2010 +0100
dccp: remove unused macros
Remove macros which have been unused since the initial implementation
(commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c, [DCCP]: Initial
implementation from Tue Aug 9 20:14:34 2005 -0700).
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Acked-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit f404c2fea37e02bec7c8b6edddf5edd22ca60505
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:37 2010 +0000
bnx2x: Update version number and a date.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5cd737c2e84bebf532f536f7addfdd75162bba04
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:29 2010 +0000
bnx2x: Fixed a compilation warning
bnx2x_src_init_t2() is used only when BCM_CNIC is defined.
So, to avoid a compilation warning, we won't define it unless
BCM_CNIC is defined.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d245a1111251d77c804e9fe362e9f70aba856e1e
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:17 2010 +0000
bnx2x: Use dma_alloc_coherent() semantics for ILT memory allocation
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2297a2da5a8507bf6596dc30ace3483c00bd85ed
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:09 2010 +0000
bnx2x: LSO code was broken on BE platforms
Make the LSO code work on BE platforms: parsing_data field of
a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong
values for TCP header's length and offset and, as a result, the corresponding
PCI device was performing bad DMA reads triggering EEH.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4bc65dd8d88671712d71592a83374cfb0b5fce7a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Dec 7 22:26:15 2010 +0000
filter: use size of fetched data in __load_pointer()
__load_pointer() checks data we fetch from skb is included in head
portion, but assumes we fetch one byte, instead of up to four.
This wont crash because we have extra bytes (struct skb_shared_info)
after head, but this can read uninitialized bytes.
Fix this using size of the data (1, 2, 4 bytes) in the test.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 60d509c823cca21e77d537bd356785f7cfe8f0d1
Author: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Date: Fri Dec 3 02:39:01 2010 +0000
The new jhash implementation
The current jhash.h implements the lookup2() hash function by Bob Jenkins.
However, lookup2() is outdated as Bob wrote a new hash function called
lookup3(). The patch replaces the lookup2() implementation of the 'jhash*'
functions with that of lookup3().
You can read a longer comparison of the two and other hash functions at
http://burtleburtle.net/bob/hash/doobs.html.
Signed-off-by: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Acked-by: Rusty Russell <rusty(a)rustcorp.com.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 68835aba4d9b74e2f94106d13b6a4bddc447c4c8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 30 19:04:07 2010 +0000
net: optimize INET input path further
Followup of commit b178bb3dfc30 (net: reorder struct sock fields)
Optimize INET input path a bit further, by :
1) moving sk_refcnt close to sk_lock.
This reduces number of dirtied cache lines by one on 64bit arches (and
64 bytes cache line size).
2) moving inet_daddr & inet_rcv_saddr at the beginning of sk
(same cache line than hash / family / bound_dev_if / nulls_node)
This reduces number of accessed cache lines in lookups by one, and dont
increase size of inet and timewait socks.
inet and tw sockets now share same place-holder for these fields.
Before patch :
offsetof(struct sock, sk_refcnt) = 0x10
offsetof(struct sock, sk_lock) = 0x40
offsetof(struct sock, sk_receive_queue) = 0x60
offsetof(struct inet_sock, inet_daddr) = 0x270
offsetof(struct inet_sock, inet_rcv_saddr) = 0x274
After patch :
offsetof(struct sock, sk_refcnt) = 0x44
offsetof(struct sock, sk_lock) = 0x48
offsetof(struct sock, sk_receive_queue) = 0x68
offsetof(struct inet_sock, inet_daddr) = 0x0
offsetof(struct inet_sock, inet_rcv_saddr) = 0x4
compute_score() (udp or tcp) now use a single cache line per ignored
item, instead of two.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit defb3519a64141608725e2dac5a5aa9a3c644bae
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 21:16:57 2010 -0800
net: Abstract away all dst_entry metrics accesses.
Use helper functions to hide all direct accesses, especially writes,
to dst_entry metrics values.
This will allow us to:
1) More easily change how the metrics are stored.
2) Implement COW for metrics.
In particular this will help us put metrics into the inetpeer
cache if that is what we end up doing. We can make the _metrics
member a pointer instead of an array, initially have it point
at the read-only metrics in the FIB, and then on the first set
grab an inetpeer entry and point the _metrics member there.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
commit b7613370db5ba66ad81e41cd3a5417fde4d5e03c
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Thu Dec 9 09:08:47 2010 -0500
ath: fix build break with ATH_DBG_WARN_ON_ONCE
Description by Hauke:
"If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and
returns something, but if CONFIG_ATH_DEBUG is not set it does not return
anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in
an if case and is not returning anything and causes a compile error.
CC [M] /drivers/net/wireless/ath/ath9k/main.o
/drivers/net/wireless/ath/ath9k/main.c: In function ‘ath_isr’:
/drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression
before ‘do’
make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1
make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2"
Reported-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4e53f78e5b06c073a5c10814c72e98c1ca8a9f10
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 19:16:37 2010 +0200
tools/virtio: virtio_test tool
This is the userspace part of the tool: it includes a bunch of stubs for
linux APIs, somewhat simular to linuxsched. This makes it possible to
recompile the ring code in userspace.
A small test example is implemented combining this with vhost_test
module.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 71ccc212e5b28dfcc870b6db6589c2df264fdc6a
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 19:09:01 2010 +0200
vhost test module
This adds a test module for vhost infrastructure.
Intentionally not tied to kbuild to prevent people
from installing and loading it accidentally.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 28831ee60b79bed50958c9cb0d2e76cdc98406f9
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 10:22:10 2010 +0200
vhost: better variable name in logging
We really store a page offset in write_address,
so rename it write_page to avoid confusion.
Signed-off-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit b7ee1d01c5ff3bf2e51c8565ea00823cdbc2a9f3
Author: Sedat Dilek <sedat.dilek(a)gmail.com>
Date: Tue Dec 7 22:35:50 2010 +0100
ath5k: Fix modinfo does not list alias -> pci-id lines
The AHB bus support patchset moved the table "Known PCI ids" from base.c
to pci.c - unfortunately, MODULE_DEVICE_TABLE() was not transferred.
With this fix 'modinfo ath5k' lists the alias -> pci-id lines, again.
The issue was introduced by:
commit e5b046d86fac609f636d127a38de94a175c7e83b
"ath5k: Move PCI bus functions to separate file."
Signed-off-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3bf9be40ff76b6df136f14a497167c116b2b3c53
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 10:19:07 2010 +0200
vhost: correctly set bits of dirty pages
Fix two bugs in dirty page logging:
When counting pages we should increase address by 1 instead of
VHOST_PAGE_SIZE. Make log_write() correctly process requests
that cross pages with write_address not starting at page boundary.
Reported-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit a290aec88a9c4747353ea7aa9b2569bd61297c3c
Author: Jason Wang <jasowang(a)redhat.com>
Date: Mon Nov 29 13:48:40 2010 +0800
vhost: fix typos in comment
Signed-off-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit bf5e0bd27f7cbaca4d52ae395bbf3715775efebd
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Sun Nov 14 17:33:25 2010 +0200
vhost: remove unused include
vhost.c does not need to know about sockets,
don't include sock.h
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 84b3cdc38cd2882d7ac3c2ae4b6faf5c199874e3
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 18:41:03 2010 -0800
can: slcan: Add missing linux/sched.h include.
drivers/net/can/slcan.c: In function 'slcan_open':
drivers/net/can/slcan.c:568: error: dereferencing pointer to incomplete type
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fe6c791570efe717946ea7b7dd50aec96b70d551
Merge: f8bf568 f198725
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 13:15:38 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
commit 393934c6b5c8d00f9d1ae20670d4a770f07a418a
Merge: 69f4aab 0a54917
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Dec 8 16:23:31 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c
commit 69f4aab1157d2a386e7ea4de77cc253629d1b4f2
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Dec 7 15:13:23 2010 -0800
ath9k_hw: warn if we cannot change the power to the chip
Suspend requires the device to be in fullsleep otherwise upon
resume the device becomes unresponsive. We need to ensure
that when we want the device to go to sleep it yields to
the request, otherwise we'll have a useless devices upon
resume. Warn when changing the power fails as we need
to look into these issues.
Cc: Paul Stewart <pstew(a)google.com>
Cc: Amod Bodas <amod.bodas(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff9f0b639f33c92a89b0799263ab625444be6ee1
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Dec 7 15:13:22 2010 -0800
ath9k: skip ATH9K_INT_TIM_TIMER when we are idle
We should not be idle when we get the ATH9K_INT_TIM_TIMER,
otherwise its a sign of something broken in our design with
our idle state machine and mac80211. Skip these and WARN once
just in case this is triggerable.
Cc: Paul Stewart <pstew(a)google.com>
Cc: Amod Bodas <amod.bodas(a)atheros.com>
signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b7e8941b2df518186d9f7679c007f6b619bb4e89
Author: Amitkumar Karwar <akarwar(a)marvell.com>
Date: Tue Dec 7 13:43:03 2010 -0800
cfg80211: add some element IDs in enum ieee80211_eid
1)WLAN_EID_BSS_COEX_2040
2)WLAN_EID_OVERLAP_BSS_SCAN_PARAM
3)WLAN_EID_EXT_CAPABILITY
Signed-off-by: Amitkumar Karwar <akarwar(a)marvell.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 692d2c0fb36c02ad07d54641c26f48e644b27fbd
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:56:00 2010 +0100
b43: rename config option for N-PHY, drop BROKEN
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 82a52043c7801f83c7387deb45bf9323af04644b
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:55:59 2010 +0100
b43: fix split of N-PHY devices into supported and not (based on PHY rev)
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit abc1f7cd531f80a8468ab654f1dfd35d58bd2490
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:55:58 2010 +0100
b43: set TMS to work with current band width for N-PHY
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c7455cf988f06ba578cc6a680392426fce382ca1
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:55:57 2010 +0100
b43: N-PHY: silence warnings
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2f886750118c1781d3b53268bf25519aef1d4d71
Author: Ben Greear <greearb(a)candelatech.com>
Date: Tue Dec 7 11:27:01 2010 -0800
mac80211: Show max number of probe tries in debug message.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 155180803c95c7b14b355f60431bef45116c151e
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:07 2010 +0100
b43: flush PHY writes when needed
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 755fd183b89bc8a302669b6f35cd98faee473f7a
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:06 2010 +0100
b43: N-PHY: implement own maskset
This let us avoid double addressing while still having reg check.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f00fe7f6d14ab7bbd4655f55eae71bbd73ef766d
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:05 2010 +0100
b43: N-PHY: reorder and optimize tables initialization
Order was changed in specs. For writing arrays we have designed bulk function
which makes use of auto increment and do not write table address over and over.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 857581bdf1a3b36bfd42609d6f5433bd83397127
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:04 2010 +0100
b43: N-PHY: update init tables
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a9927ba3c5f3c5f6b0e8fa7557452335edeaf5fa
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Dec 6 21:13:49 2010 -0800
ath9k: Check for NULL sta in ath_tx_start
It can be NULL according to docs, and logging showed it
to be NULL in practice.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 80d7e403c97b712e302ec37e9beceff1dbdc9402
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Fri Nov 19 12:40:26 2010 +0100
mac80211: Apply ht_opmode changes in ieee80211_change_bss
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 50b12f597be354a5a224f05c65c54c0667e57aec
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Fri Nov 19 12:40:25 2010 +0100
cfg80211: Add new BSS attribute ht_opmode
Add a new BSS attribute to allow hostapd to set the current HT opmode.
Otherwise drivers won't be able to set up protection for HT rates in
AP mode.
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8bf5681cf15f77692c8ad8cb95d059ff7c622c9
Author: Namhyung Kim <namhyung(a)gmail.com>
Date: Tue Dec 7 04:49:06 2010 +0000
isdn/hisax: fix compiler warning on hisax_pci_tbl
Annotate hisax_pci_tbl as '__used' to fix following warning:
CC drivers/isdn/hisax/config.o
drivers/isdn/hisax/config.c:1920: warning: ‘hisax_pci_tbl’ defined but not used
Signed-off-by: Namhyung Kim <namhyung(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 920b8d913bd3d963d5c88bca160a272b71e0c95a
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Dec 7 05:05:18 2010 +0000
af_packet: fix freeing pg_vec twice on error path
It is introduced in:
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman(a)tuxdriver.com>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f6dafa95d1a48f73ab4a5b0f7dc0dcb72817e051
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Dec 7 04:26:16 2010 +0000
af_packet: eliminate pgv_to_page on some arches
Some arches don't need flush_dcache_page(), and don't implement it, so
we can eliminate pgv_to_page() calls on those arches.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 15c2d75f49189e1769c5e8f5f099d03d055c4910
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Dec 7 00:30:37 2010 +0000
net: call dev_queue_xmit_nit() after skb_dst_drop()
Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit()
after skb_dst_drop() in dev_hard_start_xmit().
When queueing a packet into af_packet socket, we drop dst anyway.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 62ab0812137ec4f9884dd7de346238841ac03283
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Dec 6 20:50:09 2010 +0000
filter: constify sk_run_filter()
sk_run_filter() doesnt write on skb, change its prototype to reflect
this.
Fix two af_packet comments.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 38f49e8801565674c424896c3dcb4228410b43a8
Author: Roger Luethi <rl(a)hellgate.ch>
Date: Mon Dec 6 00:59:40 2010 +0000
via-rhine: hardware VLAN support
This patch adds VLAN hardware support for Rhine chips.
The driver uses up to 3 additional bytes of buffer space when extracting
802.1Q headers; PKT_BUF_SZ should still be sufficient.
The initial code was provided by David Lv. I reworked it to use standard
kernel facilities. Coding style clean up mostly follows via-velocity.
Adapted to new interface for VLAN acceleration (per request of Jesse Gross).
Signed-off-by: David Lv <DavidLv(a)viatech.com.cn>
Signed-off-by: Roger Luethi <rl(a)hellgate.ch>
drivers/net/via-rhine.c | 326 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 312 insertions(+), 14 deletions(-)
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 941666c2e3e0f9f6a1cb5808d02352d445bd702c
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Dec 5 01:23:53 2010 +0000
net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
Le dimanche 05 décembre 2010 à 09:19 +0100, Eric Dumazet a écrit :
> Hmm..
>
> If somebody can explain why RTNL is held in arp_ioctl() (and therefore
> in arp_req_delete()), we might first remove RTNL use in arp_ioctl() so
> that your patch can be applied.
>
> Right now it is not good, because RTNL wont be necessarly held when you
> are going to call arp_invalidate() ?
While doing this analysis, I found a refcount bug in llc, I'll send a
patch for net-2.6
Meanwhile, here is the patch for net-next-2.6
Your patch then can be applied after mine.
Thanks
[PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
dev_getbyhwaddr() was called under RTNL.
Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use
RCU locking instead of RTNL.
Change arp_ioctl() to use RCU instead of RTNL locking.
Note: this fix a dev refcount bug in llc
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a2d4b65d477aad1fe8c7218781a031fa9cf5abfc
Merge: 01b0c5c 0491026
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 10:01:00 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit 01b0c5cfb23f19837650aa53495ace6d0fd7d3f8
Author: Thiago Farina <tfransosi(a)gmail.com>
Date: Sat Dec 4 15:22:46 2010 +0000
net/9p/protocol.c: Remove duplicated macros.
Use the macros already provided by kernel.h file.
Signed-off-by: Thiago Farina <tfransosi(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit aa9421041128abb4d269ee1dc502ff65fb3b7d69
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Sat Dec 4 02:31:41 2010 +0000
net: init ingress queue
The dev field of ingress queue is forgot to initialized, then NULL
pointer dereference happens in qdisc_alloc().
Move inits of tx queues to netif_alloc_netdev_queues().
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a1044e36e457fb6dbdf90ce756d578b251d99b5e
Author: Oliver Hartkopp <socketcan(a)hartkopp.net>
Date: Thu Dec 2 10:57:59 2010 +0000
can: add slcan driver for serial/USB-serial CAN adapters
This patch adds support for serial/USB-serial CAN adapters implementing the
LAWICEL ASCII protocol for CAN frame transport over serial lines.
The driver implements the SLCAN line discipline and is heavily based on the
slip.c driver. Therefore the code style remains similar to slip.c to be able
to apply changes of the SLIP driver to the SLCAN driver easily.
For more details see the slcan Kconfig entry.
Signed-off-by: Oliver Hartkopp <socketcan(a)hartkopp.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 58e481f66e31e9976558f3e4f709baf9201052fe
Author: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Date: Thu Dec 2 02:45:08 2010 +0000
atm: lanai: use kernel's '%pM' format option to print MAC
Signed-off-by: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Cc: Chas Williams <chas(a)cmf.nrl.navy.mil>
Cc: linux-atm-general(a)lists.sourceforge.net
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7659a193f94c0003dd06e9e874d19bade1a8c952
Author: Javier Cardona <javier(a)cozybit.com>
Date: Tue Dec 7 10:41:47 2010 -0800
mac80211: Fix compilation error when mesh is disabled
Wrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation
problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cae6b74d907e2abd22d496fe30417b088d3302cf
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Dec 7 21:23:16 2010 +0530
ath9k: Remove dead code in recv.c
The structure struct ieee80211_rx_status *rxs is no longer needed to be
passed to ath_rx_send_to_mac80211 function
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0ce3bcfc84900a64347b0fe1140229bd81314008
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Dec 7 21:14:15 2010 +0530
ath9k: Parse DTIM period from mac80211
With the current save power save implementation we assume a dtim period
of 1.This value is assigned based on a sanity check in the driver
eventhough we had not parsed it from mac80211.This patch obtains the actual
DTIM period from AP by parsing it from mac80211.Yet for handling
multicast traffic we may still have it as fixed rather than parsing it
from mac80211 .This does not breaks power save or anything as the sleep
duration is currently fixed in the driver.This patch may serve to improve
power save in the future by using dtim period for sleep duration and using
correct dtim period adhoc mode.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aaef24b4c9f5db726e618977b74ffef924360de5
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Dec 7 20:40:58 2010 +0530
ath9k: Properly use unlikely check macro
AUTOSLEEP feature is enabled only for AR9271 and AR9003 version
chipsets.So unlikely macro should be used only to check whether
auto-sleep feature is enabled
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit caa0a99acd2c4eb0a8d4e9caae397291e4cf743a
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Tue Dec 7 16:32:02 2010 +0530
ath9k_htc: Fix panic on FW download failure
Use the correct error condition exit in case firmware download
fails for some reason. Not doing so results in a panic:
usb 1-3: ath9k_htc: Transferred FW: ar9271.fw, size: 51280
usb 1-3: ath9k_htc: Firmware - ar9271.fw download failed
usb 1-3: ath9k_htc: Target is unresponsive
Failed to initialize the device
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
Pid: 2823, comm: insmod Tainted: G W 2.6.37-rc4-wl #11
Call Trace:
[<ffffffff81090d7e>] __lock_acquire+0xe3e/0x1d00
[<ffffffff813a9f14>] ? restore_args+0x0/0x30
[<ffffffff81058af1>] ? vprintk+0x321/0x500
[<ffffffff81092290>] lock_acquire+0xa0/0x190
[<ffffffffa02a0eac>] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffff813a8ea8>] _raw_spin_lock_irq+0x48/0x60
[<ffffffffa02a0eac>] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffff813a53fd>] ? printk+0x3c/0x3f
[<ffffffffa02a0eac>] usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffffa0055388>] ath9k_hif_usb_dealloc_urbs+0x18/0x40 [ath9k_htc]
[<ffffffffa00557d7>] ath9k_hif_usb_probe+0x227/0x3d0 [ath9k_htc]
[<ffffffffa02a56ac>] usb_probe_interface+0x10c/0x210 [usbcore]
[<ffffffff812ae826>] driver_probe_device+0x96/0x1c0
[<ffffffff812ae9f3>] __driver_attach+0xa3/0xb0
[<ffffffff812ae950>] ? __driver_attach+0x0/0xb0
[<ffffffff812ad6ae>] bus_for_each_dev+0x5e/0x90
[<ffffffff812ae4c9>] driver_attach+0x19/0x20
[<ffffffff812ae038>] bus_add_driver+0x168/0x320
[<ffffffff812aec71>] driver_register+0x71/0x140
[<ffffffff811fc338>] ? __raw_spin_lock_init+0x38/0x70
[<ffffffffa02a438c>] usb_register_driver+0xdc/0x190 [usbcore]
[<ffffffffa0063000>] ? ath9k_htc_init+0x0/0x4f [ath9k_htc]
[<ffffffffa005599e>] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc]
[<ffffffffa006302b>] ath9k_htc_init+0x2b/0x4f [ath9k_htc]
[<ffffffff8100212f>] do_one_initcall+0x3f/0x180
[<ffffffff8109ef9b>] sys_init_module+0xbb/0x200
[<ffffffff8100bf52>] system_call_fastpath+0x16/0x1b
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 692d6b175b392512881ab374567e900fc825d487
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Tue Dec 7 16:31:54 2010 +0530
ath9k_htc: Add support for handling TX power configuration
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0b5ead91cda63e0db964dadc77601233434f60cb
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Tue Dec 7 16:31:38 2010 +0530
ath9k_htc: Cleanup device identification
ath.ko is a common module shared between ath5k, ar9170usb, ath9k and ath9k_htc.
Adding driver specific data to the shared structure would impact all the
drivers. Handling USB device recognition for devices specific to ath9k_htc
can be handled within the driver itself.
Also, AR7010 refers to the processor used in both AR9280/AR9287 based
devices. Rename the device enumerations accordingly.
While at it, check properly for the bus type when choosing the EEPROM
base address for UB95.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c658e5db01117bf2a321a9a782754dd5b10e2f15
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Dec 7 04:40:18 2010 +0100
mac80211: fix a compiler warning
net/mac80211/mlme.c: In function 'ieee80211_sta_work':
net/mac80211/mlme.c:1981: warning: too many arguments for format
Introduced by commit 04ac3c0ee2c773c321ec472d892635a20556f34d
("mac80211: speed up AP probing using nullfunc frames").
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 22d8d9f81b8b054df2f7f82daffcb71608f411e4
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Dec 7 11:08:12 2010 +0900
ath5k: Use capabilities information for the number of TX queues
One thing I missed in my WME series: Older hardware does not have enough
hardware queues to support WME. In this case we just set up one data queue. Use
the capability information to decide how many queues to set up.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d7fd1b50a51be3fe6554fbab8953fa8a3ff4009b
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Dec 6 13:13:07 2010 -0800
ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE.
This decreases spammage in the log. A single line message
will still be printed, so users can be aware that problem
exists.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Acked-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1435894dcd263fdbdd5e1ea2a684289dff187c34
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:28:00 2010 -0800
ath9k: Add device id of AR9485 to pci table
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a95f1600081211433c5ff6f3668061c821552e9f
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:59 2010 -0800
ath9k_hw: Disable MRC CCK for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 11441fb8b700bd782ae72d3dd87453fc5bc2ff12
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:58 2010 -0800
ath9k_hw: Setup paprd only for supported chains
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7090ad1416d0311677c43728494c6028aa2436b6
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:57 2010 -0800
ath9k_hw: Program appropriate register for temperature compensation cal for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 858b7e36e82cc03cb77b64f096b64446a24a346a
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:56 2010 -0800
ath9k_hw: Add IQ cal changes for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 31faff815bd9d87c370f799dff03948ed362d260
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:55 2010 -0800
ath9k_hw: Define IQcal correction coefficient registers using index
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6559e83ebd2cac06c54ebb2b7f635cf2e434f25c
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:54 2010 -0800
ath9k_hw: Program appropriate chianmask for AR9485 before starting AGC/IQ cal
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5f139eba4174d9a3343efc7cfb8a0a9cb184c647
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:53 2010 -0800
ath9k_hw: Configure power control only for the supported chains
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dd040f76cef0cc977b83e905a16b68d41322b735
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:52 2010 -0800
ath9k_hw: Read and configure turnning caps to regulate freq accuracy
Right now it is done for only AR9485, will be done for ar9003 also
after proper testing.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ab09b5b4beda8b33a117bf6fbbb2b5aa8f566129
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Tue Dec 7 02:20:39 2010 -0800
ath9k_hw: Configure internal regulator for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 47e84dfb411fcaa51e12d94ab82570ec3aa86e32
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:49 2010 -0800
ath9k_hw: Read and configure antenna diversity control for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9936e65fae6d95c2acc2438c60a8f4908130530e
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:48 2010 -0800
ath9k_hw: Configure xpa bias level for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d9a2545ac713e26ab8c8eee741d2da1626cebd6e
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:47 2010 -0800
ath9k: Read spur channel information from eeprom for AR9485
Also spur channel count and range is different for AR9485.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 272ceba892208013a45847276a00ccae54e2b94a
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:46 2010 -0800
ath9k_hw: Add a helper function to get spur channel pointer from cal data for AR9003 family
This helper function would be used for AR9485.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 85dd0921e686ed2f0283cef358a91ecaa36ccc8f
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:45 2010 -0800
ath9k_hw: Find chansel of AR_PHY_65NM_CH0_SYNTH7 for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d09b17f73fd8f475f33d0b8311d7b5a0bed67c67
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:44 2010 -0800
ath9k: Configure pll control for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 47c80de62e9d6d262a829502d689a8b56add8d3d
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:43 2010 -0800
ath9k_hw: Find the maximum number of chains that hw supports
Have it in ah->caps. This will be used during various
calibrations.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8060e169e02fe855f5533b5ef6af1f23ae2db0c4
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:42 2010 -0800
ath9k: Enable extended synch for AR9485 to fix L0s recovery issue
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7f1c7a6ac57ff0482219aa3f62eb9d0f8fe65867
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:41 2010 -0800
ath9k: Disable TX STBC for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 784ad50324ec531fa4ab22586fe305657cc6e307
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:40 2010 -0800
ath9k_hw: Disable LDPC for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 60e0c3a782f9060327751492dac949210154759b
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:39 2010 -0800
ath9k_hw: Eeeprom changes for AR9485
Calibration data are stored at 4k address (0xfff). The cal data
for AR9485 is not compressed so its lengh can exceed 1024 limit,
take care of that.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff48ba464e3503149657c60d46e8f4e9b4ed27fa
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:38 2010 -0800
ath9k_hw: Initialize tx/rx gain table from initvals.h for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c88457eb83fb6db7a3286a685ecc6e33a7aac49d
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:37 2010 -0800
ath9k_hw: Initialize mode registers for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3050c9146b2a4c98a916192fac2867c0023ec2b1
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:36 2010 -0800
ath9k_hw: Enable hw initialization for AR9485
Also make it a supported mac
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d9c803e1864d563b07382eb1bb8979cd70b1001e
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:35 2010 -0800
ath9k_hw: Add initvals.h for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3bbb780cca79dfe0200d33afb95a8990acde65b9
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:34 2010 -0800
ath9k_hw: Define hw version macros for AR9485
AR9485 is a single chain and single band (2.4 Ghz) chip.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b7555ec7c604f2f00e432579dac29df5ce525433
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Dec 7 14:13:49 2010 -0500
ath5k: remove MODULE_VERSION
Since this is updated manually and sporadically, it is fairly useless
anyway.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a1cbc7a88985976267a851a2e1080578711b3b0d
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:38 2010 -0800
ath: Fix ath_dbg access beyond array bound
ar9300RateSize is not necessarily a power of 4.
Change ar9003_hw_set_target_power_eeprom
to print the targetPowerValT2 array one per line.
ath9k_hw_ar9300_set_txpower repeated the output 4 times per line,
change it to print the targetPowerValT2 value one per line.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 226afe68fdbd1aa3680158aca0a3631cbd019626
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:37 2010 -0800
ath: Convert ath_print to ath_dbg
Remove ath/debug.h and the includes of these files.
Coalesce long formats.
Correct a few misspellings and missing "\n"s from these logging messages.
Remove unnecessary trailing space before a newline.
Remove ARRAY_SIZE casts, use printf type %zu
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3800276a40751539a920ef8e0537ef2e19126799
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:36 2010 -0800
ath: Convert ath_print(.., ATH_DBG_FATAL to ath_err
So these errors are always emitted at KERN_ERR level.
Remove ARRAY_SIZE casts, use printf type %zu
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 21a99f934949807dc0c9dc7642bbf0081b7582f9
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:35 2010 -0800
ath: Add and use ath_printk and ath_<level>
Add ath_printk and ath_<level> similar to
dev_printk and dev_<level> from device.h
This allows a more gradual rename of ath_print
to to ath_dbg or perhaps ath_debug.
This basically removes debug.h leaving
only an #define ath_printk ath_dbg
there and moving all the ATH_DBG_<foo>
enums to ath.h
I do not think there's much purpose for struct
ath_common * being passed to the ath_printk
functions, but perhaps there might be.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0ab82b04ac83a05bda3ef8499f415fc6fd6ee206
Author: Eliad Peller <eliad(a)wizery.com>
Date: Fri Dec 3 02:16:23 2010 +0200
mac80211: fix dynamic-ps/pm_qos magic numbers
mac80211 uses pm_qos (/dev/network_latency) in order to determine the
dynamic ps timeout (or disable the dynamic-ps at all in some cases).
commit ff616381 added a comparison for the current network_latency
against one high value (1900ms), and against the default value
(2000sec, rather than the commented 2sec).
however, the representation of 1900ms was incorrect:
1900ms = 1900000us ( != 1900000000 )
fix it by using USEC_TO_MSEC/SEC consts.
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 329b32fedc94fd9158f1635ac64f4ae6a00d374c
Author: David Kilroy <kilroyd(a)googlemail.com>
Date: Thu Dec 2 18:19:21 2010 +0000
orinoco: allow IW_AUTH_MFP to pass through
The card doesn't support MFP, so silently accept DISABLED and OPTIONAL
settings.
This avoids the following failure in wpa_supplicant logs:
State: SCANNING -> ASSOCIATING
wpa_driver_wext_set_operstate: operstate 0->0 (DORMANT)
netlink: Operstate: linkmode=-1, operstate=5
wpa_driver_wext_associate
wpa_driver_wext_set_drop_unencrypted
wpa_driver_wext_set_psk
wpa_driver_wext_associate: assoc failed because set_auth_param(IW_AUTH_MFP) failed
Association request to the driver failed
Signed-off by: David Kilroy <kilroyd(a)googlemail.com>
Reported by: Giacomo Comes <comes(a)naic.edu>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 541a45a142df281c974d74eac2066138fc107b23
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 19:12:43 2010 +0900
nl80211/mac80211: Report signal average
Extend nl80211 to report an exponential weighted moving average (EWMA) of the
signal value. Since the signal value usually fluctuates between different
packets, an average can be more useful than the value of the last packet.
This uses the recently added generic EWMA library function.
--
v2: fix ABI breakage and change factor to be a power of 2.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c39d35ebffeea5996a6f8fd8430fae9acfb8aeaf
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Tue Dec 7 19:11:26 2010 +0000
sfc: Generalise filter spec initialisation
Move search_depth arrays into per-table state.
Define initialisation function efx_filter_init_rx() which sets
everything apart from the match fields.
Define efx_filter_set_{ipv4_local,ipv4_full,eth_local}() to set the
match fields. This allows some simplification of callers and later
support for additional protocols and more flexible matching using
multiple calls to these functions.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 8891681af928f1da795cd4bd59043e5e0fadd6c8
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Tue Dec 7 19:02:27 2010 +0000
sfc: Remove filter table IDs from filter functions
The separation between filter tables is largely an internal detail
and it may be removed in future hardware. To prepare for that:
- Merge table ID with filter index to make an opaque filter ID
- Wrap efx_filter_table_clear() with a function that clears filters
from both RX tables, which is all that the current caller requires
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit ac33ac610dc613b2b1c938f8b61eef651ab72563
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Tue Dec 7 18:29:52 2010 +0000
sfc: Log start and end of ethtool self-test at INFO level
Add message at start of self-test and increase log level of message at
end of self-test, so that any other messages produced during the
test are clearly associated with it.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 04910265078f08a73208beab70ed2a3cce4a919f
Author: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Date: Sat Dec 4 13:39:13 2010 +0100
dccp qpolicy: Parameter checking of cmsg qpolicy parameters
Ensure that cmsg->cmsg_type value is valid for qpolicy
that is currently in use.
Signed-off-by: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 871a2c16c21b988688b4ab1a78eadd969765c0a3
Author: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Date: Sat Dec 4 13:38:01 2010 +0100
dccp: Policy-based packet dequeueing infrastructure
This patch adds a generic infrastructure for policy-based dequeueing of
TX packets and provides two policies:
* a simple FIFO policy (which is the default) and
* a priority based policy (set via socket options).
Both policies honour the tx_qlen sysctl for the maximum size of the write
queue (can be overridden via socket options).
The priority policy uses skb->priority internally to assign an u32 priority
identifier, using the same ranking as SO_PRIORITY. The skb->priority field
is set to 0 when the packet leaves DCCP. The priority is supplied as ancillary
data using cmsg(3), the patch also provides the requisite parsing routines.
Signed-off-by: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit cfa969e385a23e4c85f50e0ed5de25a2e18bf9d4
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Dec 6 20:45:28 2010 -0800
Revert "ehea: Use the standard logging functions"
This reverts commit 539995d18649023199986424d140f1d620372ce5.
As reported by Stephen Rothwell, this breaks the build.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cd38557d78554fd4318fe448f728a8d7ff1cbabb
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Nov 15 23:53:11 2010 +0000
sfc: Use TX push whenever adding descriptors to an empty queue
Whenever we add DMA descriptors to a TX ring and update the ring
pointer, the TX DMA engine must first read the new DMA descriptors and
then start reading packet data. However, all released Solarflare 10G
controllers have a 'TX push' feature that allows us to reduce latency
by writing the first new DMA descriptor along with the pointer update.
This is only useful when the queue is empty. The hardware should
ignore the pushed descriptor if the queue is not empty, but this check
is buggy, so we must do it in software.
In order to tell whether a TX queue is empty, we need to compare the
previous transmission count (write_count) and completion count
(read_count). However, if we do that every time we update the ring
pointer then read_count may ping-pong between the caches of two CPUs
running the transmission and completion paths for the queue.
Therefore, we split the check for an empty queue between the
completion path and the transmission path:
- Add an empty_read_count field representing a point at which the
completion path saw the TX queue as empty.
- Add an old_write_count field for use on the completion path.
- On the completion path, whenever read_count reaches or passes
old_write_count the TX queue may be empty. We then read
write_count, set empty_read_count if read_count == write_count,
and update old_write_count.
- On the transmission path, we read empty_read_count. If it's set, we
compare it with the value of write_count before the current set of
descriptors was added. If they match, the queue really is empty and
we can use TX push.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit e506147271229d6c53b42c6a9897db67b5cfdb6d
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:58:41 2010 +0000
sfc: Remove locking from implementation of efx_writeo_paged()
It is not necessary to serialise writes to the paged 128-bit
registers. However, if we don't then we must always write the last
dword separately, not as part of a qword write.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 1a29cc40115c011895143c5f8278dee49423d5df
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:55:33 2010 +0000
sfc: Add compile-time checks for correctness of paged register writes
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 494bdf1b0fd58688d055f1b66c34b0844dcfc1fa
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:55:18 2010 +0000
sfc: Remove redundant memory barriers between MMIOs
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 9f2f6cd07a09bc0af1f2950189e426569561d1e6
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:55:00 2010 +0000
sfc: Expand/correct comments on collector behaviour and function usage
Document exactly which registers and functions have special behaviour,
and why races on writes to descriptor pointers are safe.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 51c56f40ef41ca780ff001d59727eda03fa39374
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Wed Nov 10 18:46:40 2010 +0000
sfc: Use ACCESS_ONCE when copying efx_tx_queue::read_count
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit ab28c12a8e6fea875b6757052e211772f62fa771
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:53:15 2010 +0000
sfc: Reorder struct efx_nic to separate fields by volatility
Place the regularly updated fields (locks, MAC stats, etc.) on a
separate cache-line from fields which are mostly constant. This
should reduce cache misses for access to the latter on the data path.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 40fe7d88ab3eb711b307fab1b92aa6870914c975
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 2 07:22:05 2010 +0000
net: cris/eth_v10: Use net_device_stats from struct net_device_stats
struct net_device has its own struct net_device_stats member, so use
this one instead of a private copy in struct net_local.
Note: This patch was not even compile tested.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b27d50a9ff5cf2775b7a4daf571a0cc72d013b9c
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 2 07:20:39 2010 +0000
net: emaclite: Omit private ndo_get_stats function
xemaclite_get_stats() just returns dev->stats so we can leave it out
alltogether and let dev_get_stats() do the job.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e176bbc5893bef36a0909de31dea97865660a7c9
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 2 07:20:05 2010 +0000
net: am79c961a: Omit private ndo_get_stats function
am79c961_getstats() just returns dev->stats so we can leave it out
alltogether and let dev_get_stats() do the job.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Acked-by: Russell King <rmk+kernel(a)arm.linux.org.uk>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9f91170773d852e65e4fc36e1f8173ce614f62e1
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 13:24:05 2010 +0000
ixgbe: fix enum type mismatch on disable laser
Fixes a recent bug on the patch (c6ecf39a10ceec3e97096e2a8d3eadcecd593422)
that disabled the laser on ifconfig down. Compilers were seeing a enum
mismatch.
Signed-off-by Don Skidmore <donald.c.skidmore(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a7f5a5fcd9f13afd3471a0de8c1fdaa8f989497c
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 13:23:30 2010 +0000
ixgbe: fix for link failure on SFP+ DA cables
This patch helps prevent FW/SW semaphore collision from leading
to link establishment failure. The collision might mess up the
PHY registers so we reset the PHY. However there are SFI/KR areas
in the PHY that are not reset with a Reset_AN so we need to change
LMS to reset it. Also wait until AN state machine is AN_GOOD
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8917a3c0b7d1557548f50bfe3f0e18e0354e38f6
Author: David Shwatrz <dshwatrz(a)gmail.com>
Date: Thu Dec 2 09:01:55 2010 +0000
Fix a typo in datagram.c and sctp/socket.c.
Hi,
This patch fixes a typo in net/core/datagram.c and in net/sctp/socket.c
Regards,
David Shwartz
Signed-off-by: David Shwartz <dshwatrz(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 22de94de7de78b8de2fb1f2df5aa85b5556cfcfd
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Dec 3 15:41:48 2010 +0100
iwlwifi: jiffies based tx queues watchdog
This patch replace monitor/recover timer by watchdog based on time
stamp. New code allow to discover hangs more precisely.
Timeout values are currently doubled monitoring period values of
previous timer. This have to be tuned based of firmware timing
capabilities.
Tested on 3945, 4965, 5300, 6300.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit abc471dc31be15f9fee5ec77f25d31b927d334b9
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Dec 3 15:41:47 2010 +0100
iwl3945: prevent too frequent firmware resets
Similarly like on iwlagn, initialize reset duration on iwl3945 to prevent
too frequent firmware resets.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 29cbe68c516a48a9a88b3226878570c6cbd83c02
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:44 2010 +0100
cfg80211/mac80211: add mesh join/leave commands
Instead of tying mesh activity to interface up,
add join and leave commands for mesh. Since we
must be backward compatible, let cfg80211 handle
joining a mesh if a mesh ID was pre-configured
when the device goes up.
Note that this therefore must modify mac80211 as
well since mac80211 needs to lose the logic to
start the mesh on interface up.
We now allow querying mesh parameters before the
mesh is connected, which simply returns defaults.
Setting them (internally renamed to "update") is
only allowed while connected. Specify them with
the new mesh join command instead where needed.
In mac80211, beaconing must now also follow the
mesh enabled/not enabled state, which is done
by testing the mesh ID.
Signed-off-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bd90fdcc5fbd99a2a778999610420cf793bd1be2
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:43 2010 +0100
nl80211: refactor mesh parameter parsing
I'm going to need this in a new place later.
Tested-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f9e10ce4cf86945eb5efcab31284c971877ed012
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:42 2010 +0100
cfg80211: require add_virtual_intf to return new dev
cfg80211 used to do all its bookkeeping in
the notifier, but some new stuff will have
to use local variables so make the callback
return the netdev pointer.
Tested-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 09b174702601079c3a04806754be30ffbd70db4d
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:41 2010 +0100
mac80211: move mesh filter adjusting
Logically, the filter adjusting belongs with
starting/stopping mesh, not interface up/down,
so move it there.
Tested-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 45904f21655cf4f0ae7d0fab5906fe51bf56ecf4
Author: Javier Cardona <javier(a)cozybit.com>
Date: Fri Dec 3 09:20:40 2010 +0100
nl80211/mac80211: define and allow configuring mesh element TTL
The TTL in path selection information elements is different from
the mesh ttl used in mesh data frames. Version 7.03 of the 11s
draft calls this ttl 'Element TTL'.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b9e61f11f47035e3b4545b51fb547fef48eb3096
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:12:39 2010 +0200
ath5k: Include tx ack reporting on hw flags
* Since we report tx acks to the protocol stack, add the needed
flag to hw_flags. This way we'll also use the new AP probing mechanism.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f0e134a53ad95ba7a393b299ae56c9bdcaed8aec
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:09:38 2010 +0200
ath5k: Fix reporting of RX dma stop failure
* Correctly report failure to stop RX DMA
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 344b54b971bc5578281264fb6896e13b4120352b
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:07:13 2010 +0200
ath5k: Disable ANI during reset
* Stop ANI durring reset to prevent false PHY error reports
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 19252ecb672d3f35959c576d1d26b9aca350f5bf
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:05:19 2010 +0200
ath5k: Always free tx buffers before reset
* Always free tx buffers before reset, since we also empty hw queues.
If we don't and a queue gets stuck, we'll never decrease txq_len and sw
will keep thinking the queue is still stuck even after reset.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d5311e4e8272fd398fc1cf278f12fd6dee4074b
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Dec 1 20:46:24 2010 +0000
filter: add a security check at install time
We added some security checks in commit 57fe93b374a6
(filter: make sure filters dont read uninitialized memory) to close a
potential leak of kernel information to user.
This added a potential extra cost at run time, while we can perform a
check of the filter itself, to make sure a malicious user doesnt try to
abuse us.
This patch adds a check_loads() function, whole unique purpose is to
make this check, allocating a temporary array of mask. We scan the
filter and propagate a bitmask information, telling us if a load M(K) is
allowed because a previous store M(K) is guaranteed. (So that
sk_run_filter() can possibly not read unitialized memory)
Note: this can uncover application bug, denying a filter attach,
previously allowed.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Dan Rosenberg <drosenberg(a)vsecurity.com>
Cc: Changli Gao <xiaosuo(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Wed Dec 1 20:07:31 2010 +0000
net: arp: use assignment
Only when dont_send is 0, arp_filter() is consulted, so we can simply
assign the return value of arp_filter() to dont_send instead.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6464281161e46254ac39505ad41d21dbe7d1738f
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Wed Dec 1 01:04:17 2010 +0000
be2net: Handle out of buffer completions for lancer
If Lancer chip does not have posted RX buffers, it posts an RX completion entry
with the same frag_index as the last valid completion. The Error bit is also
set. In BE, a flush completion is indicated with a zero value for num_rcvd in
the completion.
Such completions don't carry any data and are not processed.
This patch refactors code to handle both cases with the same code.
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar(a)emulex.com>
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 359a972fae84242efa26b86bf09c3ac3784405ba
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Wed Dec 1 01:03:36 2010 +0000
be2net: FW init cmd fix for lancer
Lancer can use the same pattern as BE to indicate a driver load
to the FW.
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar(a)emulex.com>
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 63657b9c319588cd35ed869e19cc6255dbef0d20
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Wed Dec 1 01:02:28 2010 +0000
be2net: Fix be_dev_family_check() return value check
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c56b4d90123b77e29a91b9b96bb791f929139d8e
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Wed Dec 1 02:52:57 2010 +0000
af_packet: remove pgv.flags
As we can check if an address is vmalloc address with is_vmalloc_addr(),
we remove pgv.flags. Then we may get more pg_vecs.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0af55bb58f8fa7865004ac48d16affe125ac1b7f
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Wed Dec 1 02:52:20 2010 +0000
af_packet: use vmalloc_to_page() instead for the addresss returned by vmalloc()
The following commit causes the pgv->buffer may point to the memory
returned by vmalloc(). And we can't use virt_to_page() for the vmalloc
address.
This patch introduces a new inline function pgv_to_page(), which calls
vmalloc_to_page() for the vmalloc address, and virt_to_page() for the
__get_free_pages address.
We used to increase page pointer to get the next page at the next page
address, after Neil's patch, it is wrong, as the physical address may
be not continuous. This patch also fixes this issue.
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman(a)tuxdriver.com>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f7fce74e387e0563e5a165704664aa5ee8b2f48b
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Dec 1 06:03:06 2010 +0000
net: kill an RCU warning in inet_fill_link_af()
commits 9f0f7272 (ipv4: AF_INET link address family) and cf7afbfeb8c
(rtnl: make link af-specific updates atomic) used incorrect
__in_dev_get_rcu() in RTNL protected contexts, triggering PROVE_RCU
warnings.
Switch to __in_dev_get_rtnl(), wich is more appropriate, since we hold
RTNL.
Based on a report and initial patch from Amerigo Wang.
Reported-by: Amerigo Wang <amwang(a)redhat.com>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Thomas Graf <tgraf(a)infradead.org>
Reviewed-by: WANG Cong <amwang(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 06a9701f4b3e3381dea96fee1cc8a3bb41b0a1f1
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Dec 1 01:37:42 2010 +0000
__in_dev_get_rtnl() can use rtnl_dereference()
If caller holds RTNL, we dont need a memory barrier
(smp_read_barrier_depends) included in rcu_dereference().
Just use rtnl_dereference() to properly document the assertions.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit da2033c282264bfba4e339b7cb3df62adb5c5fc8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 30 21:45:56 2010 +0000
filter: add SKF_AD_RXHASH and SKF_AD_CPU
Add SKF_AD_RXHASH and SKF_AD_CPU to filter ancillary mechanism,
to be able to build advanced filters.
This can help spreading packets on several sockets with a fast
selection, after RPS dispatch to N cpus for example, or to catch a
percentage of flows in one queue.
tcpdump -s 500 "cpu = 1" :
[0] ld CPU
[1] jeq #1 jt 2 jf 3
[2] ret #500
[3] ret #0
# take 12.5 % of flows (average)
tcpdump -s 1000 "rxhash & 7 = 2" :
[0] ld RXHASH
[1] and #7
[2] jeq #2 jt 3 jf 4
[3] ret #1000
[4] ret #0
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Rui <wirelesser(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 539995d18649023199986424d140f1d620372ce5
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 30 08:18:44 2010 +0000
ehea: Use the standard logging functions
Remove ehea_error, ehea_info and ehea_debug macros.
Use pr_fmt, pr_<level>, netdev_<level> and netif_<level> as appropriate.
Fix messages to use trailing "\n", some messages had an extra one
as the old ehea_<level> macros added a trailing "\n".
Coalesced long format strings.
Uncompiled/untested.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Breno Leitao<leitao(a)linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7903264402546f45f9bac8ad2bfdb00d00eb124a
Author: Michał Mirosław <mirq-linux(a)rere.qmqm.pl>
Date: Tue Nov 30 06:38:00 2010 +0000
net: Fix too optimistic NETIF_F_HW_CSUM features
NETIF_F_HW_CSUM is a superset of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM, but
some drivers miss the difference. Fix this and also fix UFO dependency
on checksumming offload as it makes the same mistake in assumptions.
Signed-off-by: Michał Mirosław <mirq-linux(a)rere.qmqm.pl>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 900d495a189dc3ff5952b98a77d18e3018f8286c
Author: Alexey Orishko <alexey.orishko(a)gmail.com>
Date: Mon Nov 29 23:23:28 2010 +0000
USB CDC NCM host driver
The patch provides USB CDC NCM host driver support in the Linux Kernel.
Changes:
drivers/net/usb/cdc_ncm.c:
- initial submission of the CDC NCM host driver;
- verified on Intel 32/64 bit, Intel Atom, ST-Ericsson U8500 (ARM)
- throughput measured over 100 Mbits duplex;
- driver supports 16-bit NTB format only, but it is more than enough for
transfers up to 64K;
- driver can handle up to 32 datagrams in received NTB;
- timer is used to collect several packets in Tx direction
drivers/net/usb/Kconfig:
- a new entry to compile CDC NCM host driver
drivers/net/usb/Makefile:
- a new entry to compile CDC NCM host driver
Signed-off-by: Alexey Orishko <alexey.orishko(a)stericsson.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 073285fd392f6dc901da7c698d46e1e2a7e26436
Author: Alexey Orishko <alexey.orishko(a)gmail.com>
Date: Mon Nov 29 23:23:27 2010 +0000
usbnet: changes for upcoming cdc_ncm driver
Changes:
include/linux/usb/usbnet.h:
- a new flag to indicate driver's capability to accumulate IP packets in Tx
direction and extract several packets from single skb in Rx direction.
drivers/net/usb/usbnet.c:
- the procedure of counting packets in usbnet was updated due to the
accumulating of IP packets in the driver
- no short packets are sent if indicated by the flag in driver_info
structure
Signed-off-by: Alexey Orishko <alexey.orishko(a)stericsson.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d84938c9be85f4738a350ef44210789fef915cb7
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:03:00 2010 +0200
ath5k: Always write tx powertable on hw
* By skipping tx power table calibration we also skip setting
tx power table on hw. Make sure we always write tx power table
on hw since it gets cleared on reset.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 04ac3c0ee2c773c321ec472d892635a20556f34d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 21:01:08 2010 +0100
mac80211: speed up AP probing using nullfunc frames
If the nullfunc frame used to probe the AP was not acked, there is no point
in waiting for the probe timeout, so advance to the next try (or disconnect)
immediately.
If we do reach the probe timeout without having received a tx status, the
connection is probably really bad and worth disconnecting.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 75706d0e9d19601534446982b70102bb9327169b
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 21:01:07 2010 +0100
mac80211: remove a redundant check
ieee80211_is_nullfunc() implies ieee80211_is_data()
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit af5568843594fb71055debe36e521fa8072fcecc
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 19:50:37 2010 +0900
lib: Improve EWMA efficiency by using bitshifts
Using bitshifts instead of division and multiplication should improve
performance. That requires weight and factor to be powers of two, but i think
this is something we can live with.
Thanks to Peter Zijlstra for the improved formula!
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
--
v2: use log2.h functions
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5dcc03fe29537edd7819f5b121bf3d779693f37b
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 19:12:31 2010 +0900
ath5k: Use EWMA factor of 1024 instead of 1000
This prepares the only place which uses the EWMA library so far for the
performance improved implementation coming up, which requires factor and
weight to be a power of two.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9a10a870e09f1fd50fd024d55232b4b72cf4e387
Author: Joe Perches <joe(a)perches.com>
Date: Wed Dec 1 09:37:55 2010 -0800
MAINTAINERS: Add ATH GENERIC UTILITIES
This file pattern is not currently shown as maintained
by atheros. Perhaps it should be?
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c1ce5a74d113f221d40625bd3ad83df2db2695b7
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Wed Dec 1 16:34:45 2010 +0100
mac80211: Update last_tx_rate only for data frames
The last_tx_rate field was also updated for non-data frames that are
often sent with a lower rate (for example management frames at 1 Mbps).
This is confusing when the data rate is actually much higher.
Hence, only update the last_tx_rate field with tx rate information
gathered from last data frames.
If the rate control algorithm filled in txrc.reported_rate we don't need
to verify this information.
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5f79ed3b1aa7af260c82ba714b90907070aeca7a
Merge: 09f921f 9f28ebc
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Dec 6 15:52:27 2010 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
commit f435d9eea01309aa7b6c1f134569a7b5957918ae
Merge: 5ee4937 09f921f
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Dec 6 15:35:34 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 5ee493767352314893520ac40aec5bb07d0147e0
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:54 2010 +0000
tg3: Update version to 3.116
This patch updates the tg3 version to 3.116.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a386b9011a4687470e6168e2f2a08c468f25f72f
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:53 2010 +0000
tg3: Relax EEE thresholds
The hardware defaults to fairly aggressive EEE thresholds. While there
appear to be no ill effects, this patch relaxes them, just as a
precaution.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a6b68dab169e2a51e59f43504f1279cbc2afcde8
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:52 2010 +0000
tg3: Minor EEE code tweaks
The first hunk of this patch makes sure that the driver checks for the
appropriate preconditions before checking if EEE negotiation succeeded.
More specifically the link needs to be full duplex for EEE to be
enabled.
The second and third hunks of this patch fix a bug where the eee
advertisement register would be programmed with extra bits set.
The fourth hunk of this patch makes sure the EEE capability flag is not
set for 5718 A0 devices and that the device is not a serdes device.
None of these modifications are strictly necessary. The driver /
hardware still does the right thing. They are submitted primarily for
correctness.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 699c019385fcb13498a5a3a8bd368f04f1d4a223
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:51 2010 +0000
tg3: Fix 57765 EEE support
EEE support in the 57765 internal phy will not enable after a phy reset
unless it sees that EEE is supported in the MAC. This patch moves the
code that programs the CPMU EEE registers to a place before the phy
reset.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3110f5f5545a645c50ef66b1f705d08dfd1df404
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:50 2010 +0000
tg3: Move EEE definitions into mdio.h
In commit 52b02d04c801fff51ca49ad033210846d1713253 entitled "tg3: Add
EEE support", Ben Hutchings had commented that the EEE advertisement
register will be in a standard location. This patch moves that
definition into mdio.h and changes the code to use it.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8fc2f9956127d2b85280c07e69aeb08b9bd85150
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:49 2010 +0000
tg3: Raise the jumbo frame BD flag threshold
The current transmit routines set the jumbo frame BD flag too
aggressively. This can reduce performance for common cases. This patch
raises the jumbo flag threshold to 1518, up from 1500.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca44ac386181ba710a9ab6db900d6c1e5451b366
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Mon Nov 29 22:48:46 2010 +0000
net: don't reallocate skb->head unless the current one hasn't the needed extra size or is shared
skb head being allocated by kmalloc(), it might be larger than what
actually requested because of discrete kmem caches sizes. Before
reallocating a new skb head, check if the current one has the needed
extra size.
Do this check only if skb head is not shared.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Cc: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 289700dbc40c78741f17e2304ed4ac0db3c3afd3
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:32:58 2010 +0000
ixgbe: add support for new format of PBA numbers
The new PBA format is stored as a string. This patch allows the
driver to support both the old and new format.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dbffcb210f45239ea530e0a71470e48abefe4210
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:32:34 2010 +0000
ixgbe: add support for 82599 FCoE SKU
Add both NIC and backplane support for FCoE enabled devices IDs.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0b077feac00a8b7b0afbab3274b2e74b749bc917
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:32:13 2010 +0000
ixgbe: add WOL support for SFP+ subdevice
This patch will add wake on LAN support to the dev/sub_dev 10FB 11A9. This
will also include ixgbe ethtool support for this device.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c6ecf39a10ceec3e97096e2a8d3eadcecd593422
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:31:51 2010 +0000
ixgbe: fix link behavior for SFP+ when driver is brought down
We have had several requests to have ifconfig down command disable
the SFP+ laser and thus make link go down. Likewise on ifconfig up
the laser would be enabled and link would come up. This patch enables
that behavior.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e4d849b8113b0cf7b6ebfa9ee4c47bd514ea49d3
Author: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Date: Thu Dec 2 20:42:08 2010 +0000
qlcnic: Updated driver version to 5.0.13
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 40839129f77903cbbb7f232e2e2ab08dfe4a4f8d
Author: Sritej Velaga <sritej.velaga(a)qlogic.com>
Date: Thu Dec 2 20:41:56 2010 +0000
qlcnic: LICENSE file for qlcnic
Signed-off-by: Sritej Velaga <sritej.velaga(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 091056b2ad04df09a3cb78a4c4ea098709b98eb3
Author: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Date: Thu Dec 2 20:41:43 2010 +0000
qlcnic: validate eswitch config values for PF
Currently driver set default eswitch configuration values for PF function,
instead of validating values sent by application.
Signed-off-by: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 97319a270da37a5eab14a770f1417d8229245270
Author: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Date: Thu Dec 2 20:41:23 2010 +0000
qlcnic: Disable loopback support
Loopback mode can not be supported in CNA mode. Removing it until FW is fixed.
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7e300bc8e6736d41e7b92978f415572ac60fd59b
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:48:28 2010 +0000
sfc: Store MAC address from NVRAM in net_device::perm_addr
For some reason we failed to make this change when perm_addr was
introduced.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 02ebc26865c2755720d2ede90a5ab27c45741823
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:48:20 2010 +0000
sfc: Use current MAC address, not NVRAM MAC address, for WoL filter
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4f3907e9a600a46d8c946469ce6636080310d12e
Author: Steve Hodgson <shodgson(a)solarflare.com>
Date: Thu Dec 2 13:48:14 2010 +0000
sfc: When waking a stopped tx_queue, only lock that tx_queue
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 78d4189d6b000898db2d9a9d745468f1322cbc71
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:56 2010 +0000
sfc: Update kernel-doc to match earlier move of Toeplitz hash key
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cef68bde74f083d83c18ce870ed834e82ee0ae5a
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:51 2010 +0000
sfc: Move xmac_poll_required into struct falcon_nic_data
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 40641ed93cd53561f7d53b5fd5ed656b35f3aabd
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:45 2010 +0000
sfc: Move Falcon global event handling to falcon.c
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4833f02a2972b7da4c8a15e1e329db0f984a75d9
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:35 2010 +0000
sfc: Move mdio_lock to struct falcon_nic_data
We only have direct access to MDIO on Falcon, so move this out of
struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4de92180258ac661bbce0f0065c9c81633ac862b
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:29 2010 +0000
sfc: Move SPI state to struct falcon_nic_data
We only have direct access to SPI on Falcon, so move all this state
out of struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 90b7a4ee610bf1d14120f5e0618ae2a3568394a5
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:17 2010 +0000
sfc: Remove unnecessary inclusion of various private header files
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6a8872c54d177abd900a0cf165b76ecb4803f052
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:10 2010 +0000
sfc: Expose Falcon BootROM config through MTD, not ethtool
The ethtool EEPROM interface is really meant for exposing chip
configuration, not BootROM configuration.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6c88b0b6dc886e49c0e6ee21d677c2e380bde688
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:01 2010 +0000
sfc: Remove broken automatic fallback for invalid Falcon chip/board config
If the Falcon board config is invalid, we cannot proceed - we do not
have a valid board type to pass to falcon_probe_board(), and if we
kluge that to work with an unknown board then other initialisation
code will crash.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 18e3ee2cf96adf072deeb291eed670f2c23bb2fc
Author: Steve Hodgson <shodgson(a)solarflare.com>
Date: Thu Dec 2 13:46:55 2010 +0000
sfc: Fix event based MCDI completion and MC REBOOT/CMDDONE ordering issue
The mcfw *never* sends CMDDONE when rebooting. Changing this so that it always
sends CMDDONE *before* REBOOT is easy on Siena, but it's not obvious that we
could guarantee to be able to implement this on future hardware.
Given this, I'm less convinced that the protocol should be changed.
To reiterate the failure mode: The driver sees this:
issue command
receive REBOOT event
Was that reboot event sent before the command was issued, or in
response to the command? If the former then there will be a subsequent
CMDDONE event, if the latter, then there will be no CMDDONE event.
Options to resolve this are:
1. REBOOT always completes an outstanding mcdi request, and we set
the credits count to ignore a subsequent CMDDONE event with
mismatching seqno.
2. REBOOT never completes an outstanding mcdi request. If there is
no CMDDONE event then we rely on the mcdi timeout code to complete
the outstanding request, incurring a 10s delay.
I'd argue that (2) is tidier, but that incurring a 10s delay is a little
needless. Let's go with (1).
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3157183a90fdbd686f939d2f032b675f7e9983d6
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:37 2010 +0000
sfc: Clear RXIN_SEL when soft-resetting QT2025C
When we enable PMA/PMD loopback this automatically sets RXIN_SEL
(inverse polarity for RXIN). We need to clear that bit during the
soft-reset sequence, as it is not done automatically.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit adc1d234116c22247e3886fb6e9bef450a0110f2
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:31 2010 +0000
sfc: Read-to-clear LM87 alarm/interrupt status at start of day
We do not want to shut down the board based on a fault that has
already been cleared.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 71839f7d162f973f5931d30d1376a2dc5c0bed5a
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:24 2010 +0000
sfc: Distinguish critical and non-critical over-temperature conditions
Set both the 'maximum' and critical temperature limits for LM87
hardware monitors on Falcon boards. Do not shut down a port until the
critical temperature is reached, but warn as soon as the 'maximum'
temperature is reached.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4484cd7dedecf59aee0775c6658f95bdee65f277
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:14 2010 +0000
sfc: Fix condition for no-op in set_phy_flash_cfg()
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f18ca364617d5e1fdd7300e025473496e397db4b
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:09 2010 +0000
sfc: Reduce log level for MCDI error response in efx_mcdi_rpc()
Some errors are expected, e.g. when sending new commands to an MC
running old firmware. Only the caller of efx_mcdi_rpc() can decide
what is a real error. Therefore log the error responses with
netif_dbg().
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b924dcf0038b8f83e65b44f679ad480d44f85aa6
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:03 2010 +0000
tipc: Delete tipc_ownidentity()
Moves the content of the native API routine tipc_ownidentity() into the
sole routine that calls it, since it can no longer be called in isolation.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 12bae479ee414f45ad8fe93530f5b6ea241bde3f
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:02 2010 +0000
tipc: Eliminate obsolete native API forwarding routines
Moves the content of each native API message forwarding routine
into the sole routine that calls it, since the forwarding routines
no longer be called in isolation. Also removes code in each routine
that altered the outgoing message's importance level since this is
now no longer possible.
The previous function mapping (parent function, and child API) was
as follows:
tipc_send2name
\--tipc_forward2name
tipc_send2port
\--tipc_forward2port
tipc_send_buf2port
\--tipc_forward_buf2port
After this commit, the children don't exist and their functionality
is completely in the respective parent.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 471450f7ec24ccd9ac24e6f05cd9358d40c09d03
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:01 2010 +0000
tipc: Eliminate an unused symbolic constant in link code
Removes a symbol that is not referenced anywhere by TIPC's link code.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 52fe7b725e0a1360d36c720ee87ab1e559df69db
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:00 2010 +0000
tipc: Eliminate useless initialization when creating subscriber
Removes initialization of a local variable that is always assigned
a different value before it is referenced.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 38f232eae20cefed2e2379d77c54babb0de6d024
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:59 2010 +0000
tipc: Remove unused domain argument from multicast send routine
Eliminates an unused argument from tipc_multicast(), now that this
routine can no longer be called by kernel-based applications.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a5c2af9922a94a875c5f4b2dcd357a1c399b7ea6
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:58 2010 +0000
tipc: Remove support for TIPC mode change callback
Eliminates support for the callback routine invoked when TIPC
changes its mode of operation from inactive to standalone or from
standalone to networked. This callback was part of TIPC's obsolete
native API and is not used by TIPC internally.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 528c771e87c3fa661bc6983b5bf0ba464d9f7c3a
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:57 2010 +0000
tipc: Delete useless function prototypes
Removes several function declarations that aren't used anywhere,
either because they reference routines that no longer exist or
because all users of the function reference it after it has already
been defined.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 28cc937eac00805e8b9c6e7ed7d590567378187f
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:56 2010 +0000
tipc: Eliminate useless return value when disabling a bearer
Modifies bearer_disable() to return void since it always indicates
success anyway.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8d71919d7afc4ade0d9de09e1d50fbf9168c368d
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:55 2010 +0000
tipc: Delete unused configuration service structure definition
Removes a structure definition that is no longer used by TIPC's
configuration service.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c80262829769419e19527f972672e8df0480235a
Author: Allan Stephens <allan.stephens(a)windriver.com>
Date: Tue Nov 30 12:00:54 2010 +0000
tipc: Remove obsolete inclusions of header files
Gets rid of #include statements that are no longer required as a
result of the merging of obsolete native API header file content
into other TIPC include files.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d265fef6ddf9042195aae551e1fde211c2a1588b
Author: Allan Stephens <allan.stephens(a)windriver.com>
Date: Tue Nov 30 12:00:53 2010 +0000
tipc: Remove obsolete native API files and exports
As part of the removal of TIPC's native API support it is no longer
necessary for TIPC to export symbols for routines that can be called
by kernel-based applications, nor for it to have header files that
kernel-based applications can include to access the declarations for
those routines. This commit eliminates the exporting of symbols by
TIPC and migrates the contents of each obsolete native API include
file into its corresponding non-native API equivalent.
The code which was migrated in this commit was migrated intact, in
that there are no technical changes combined with the relocation.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dca9b2404a6d6579828da2425c051462701efd3f
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:05:17 2010 +0000
net: kill unused macros from head file
These macros have been defined for several years since v2.6.12-rc2（tracing by git）,
but never be used. So remove them.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b672083ed36a49c323737b7c7e1d5264a7c193af
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:05:12 2010 +0000
ipv6: use ND_REACHABLE_TIME and ND_RETRANS_TIMER instead of magic number
ND_REACHABLE_TIME and ND_RETRANS_TIMER have defined
since v2.6.12-rc2, but never been used.
So use them instead of magic number.
This patch also changes original code style to read comfortably .
Thank YOSHIFUJI Hideaki for pointing it out.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 97b1ce25e8fc27f74703537ec09d4996c7a6e38a
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:04:50 2010 +0000
tcp: use TCP_BASE_MSS to set basic mss value
TCP_BASE_MSS is defined, but not used.
commit 5d424d5a introduce this macro, so use
it to initial sysctl_tcp_base_mss.
commit 5d424d5a674f782d0659a3b66d951f412901faee
Author: John Heffner <jheffner(a)psc.edu>
Date: Mon Mar 20 17:53:41 2006 -0800
[TCP]: MTU probing
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a9527a3b621e507c85b639c183c3aa22afd4eb61
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:04:43 2010 +0000
net: snmp: fix the wrong ICMP_MIB_MAX value
__ICMP_MIB_MAX is equal to the total number of icmp mib,
So no need to add 1. This wastes 4/8 bytes memory.
Change it to be same as ICMP6_MIB_MAX, TCP_MIB_MAX, UDP_MIB_MAX.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2989042ca86b94bf4ffa9486921bb300ad44225f
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:19:52 2010 +0000
can: EG20T PCH: Delete unnecessary spin_lock
Delete unnecessary spin_lock for accessing Message Object.
Since all message objects are divided into tx/rx area completely,
spin_lock processing is unnecessary.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d68f6837c4972b0433e41f8bee4b2b8205610f31
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:16:15 2010 +0000
can: EG20T PCH: Enumerate LEC macros
For easy to readable, LEC #define macros are replaced to enums.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 15ffc8fddf72712cc45d51c64bd500760ec63c80
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:15:02 2010 +0000
can: EG20T PCH: Change Message Object Index
For easy to readable, add Message Object index like below.
PCH_RX_OBJ_START
PCH_RX_OBJ_END
PCH_TX_OBJ_START
PCH_TX_OBJ_END
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8339a7ed562719e040ca783bf59fa2d614d10ac9
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:11:52 2010 +0000
can: EG20T PCH: Separate Interface Register(IF1/IF2)
CAN register of Intel PCH EG20T has 2 sets of interface register.
To reduce whole of code size, separate interface register.
As a result, the number of function also can be reduced.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 09f921f83faa49cdea25abfb98c439c01526b89d
Merge: 4cebb34 d89197c
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Thu Dec 2 15:46:37 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
commit 4cebb34caa5122216a1e2451eae9e0fc47ec2589
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:21 2010 +0100
ath5k: Fix reset and interrupts for AHB type of devices.
On WiSoc we cannot access mac register before it is resetted.
It will crash hardware otherwise.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a0b907ee2a71052fefdf6151764095f3f97b3275
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:16 2010 +0100
ath5k: Add AHB bus support.
AHB specific functions are now in ahb.c file. AHB bus is
compiled in when CONFIG_ATHEROS_AR231X is set in kernel.
All other platforms will use PCI bus.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c31b5c9c806b1fbdc9e98885d897664a0d482989
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:11 2010 +0100
ath5k: Add initial registers values for radio RF2317 chip.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e7aecd327d80b2f156b54769013aaccb2a20645a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:06 2010 +0100
ath5k: Add a function to read chipset's MAC revision
Add bus dependent revision read function which is used to
determine chipset's MAC before hardware is initialized.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8efa5d7d6ad307ae2d220def37ca89594062c40d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:06 2010 +0100
ath5k: Check if pci pdev struct is initialized in common functions.
To be able to support other busses than PCI check if pci device
structure is initialized.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4aa5d783c9e1c72e4950ff34f388077ccecac74a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:01 2010 +0100
ath5k: Use generic eeprom read from common ath_bus_opts struct.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e5b046d86fac609f636d127a38de94a175c7e83b
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:01 2010 +0100
ath5k: Move PCI bus functions to separate file.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 132b1c3ee38ea6fa0501004fd0f19acb554e5a44
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:26:56 2010 +0100
ath5k: Introduce ath5k_init_softc function as in ath9k
Split pci initialization into hardware specific
functions and softc structure initialization.
Make function naming similar to ones ath9k.
Introduce ath_bus_opts in ath5k for later
AHB bus integration.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aeae4ac9090462ea38387dcdbac4f01b944af6a4
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:26:51 2010 +0100
ath5k: Use Generic DMA for later support of AHB bus.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c30ae138aa0570665725166679bdf4207041c8df
Merge: 78b8595 be21871
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Thu Dec 2 15:17:46 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
commit 78b8595691c34478a51d1c2bcbbb0f6ec8a28247
Author: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Date: Thu Dec 2 14:45:07 2010 +0200
wireless: ray_cs: use '%pm' format option to print MAC
Signed-off-by: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Cc: "John W. Linville" <linville(a)tuxdriver.com>
Cc: linux-wireless(a)vger.kernel.org
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 547025d5d4d1056fb4b5a0c9c3c0d5c2fe22c082
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 16:23:12 2010 +0900
cfg80211: Add documentation for antenna ops
The last patch with the same title was for mac80211 ops, accidentally.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c1927d7a8fab07171d08f7a3a8b7e5fe87bb70d4
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:35 2010 +0100
mac80211: publish SMPS docs
Create a new chapter about SMPS in the
driver API part of the mac80211 book and
populate it with the existing docs.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f6b8bef3634a5c9ea326b3ab0c9615fdac5f18ab
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:34 2010 +0100
mac80211: document station handling
Add some existing documentation about station
handling to a new chapter about advanced APIs.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eebbb348df5a8c239a6300188907dec7e427bf70
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:33 2010 +0100
mac80211: publish interface iteration docs
Publish the documentation for the interface
iteration functions in the right section of
the book.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e16c01030b8794992590ff9b1b1e4b1b89e0cad3
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:32 2010 +0100
mac80211: document aggregation
Include the aggregation documentation in the
docbook, split up by public and internal docs.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cf6cb7ab59e0b37afe6e76b2e444479bf86bf933
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:31 2010 +0100
mac80211: publish some rate control docs
Add an API chapter to the rate control part of
the mac80211 book and populate it with some
existing documentation.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 625208138550562fd3bc731f53f43cb66a3be70a
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:30 2010 +0100
mac80211: publish some misc docs
There isn't a clear TX documentation yet, so
put these into the misc section for now.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7bcfda13fea4a8770deaf4b22093dc2708760128
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:29 2010 +0100
mac80211: publish docs for _ni functions
Put them along with their "regular" versions for
now, we should write more docs in the future.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d7ae30f073a179a9cebd663e7502843ddf4ba672
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:28 2010 +0100
mac80211: document workqueue
Create a new chapter for the mac80211 workqueue
that contains the documentation written for it.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2e54a7a20cf7c02ee17c56488fedb8cd3d2c2f35
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:27 2010 +0100
cfg80211: include CQM packet loss docs
Just include them in the list of functions,
there aren't any more detailed docs (yet).
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6a0141175b6026e13652339e607a35f4b6687f27
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Wed Dec 1 12:30:09 2010 +0530
ath9k_htc: Remove unused structures
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2767363192d5937e0f61f05b1b6b881da9ee55a
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 30 13:42:08 2010 -0800
wireless: Remove unnecessary casts of usb_get_intfdata
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e7797bf2c0297098056a95b6b03ea5a9a3285e36
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Nov 30 22:33:16 2010 +0100
b43: N-PHY: fix code path on PHY init
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 76b002bd6dfdd66c58669cbdfa5cd92084b6936e
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Nov 30 22:33:15 2010 +0100
b43: N-PHY: use defines for RSSI types
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 99f6c2ef1e968c0dbdfa8c5b8f2869129b860d88
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Nov 30 22:33:14 2010 +0100
b43: N-PHY: fix RSSI selection
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 44b23b488d44e56d467764ecb661830e5b02b308
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 30 12:19:11 2010 -0800
ath9k: hif_usb: Reduce indent 1 column
Invert test and return early.
Move variable declarations to local scope.
Don't initialize variables to 0 unnecessarily.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eb272441fc14ad126abfa46de8a9c58bda8added
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Nov 29 14:13:22 2010 -0800
ath9k: Move debugfs under ieee80211/[phyname]/ath9k/
This fixes debugfs problems when a phy is renamed,
and is able to remove a bit of code that is no longer
needed.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit db3949c4506a21633469d71f2915cf660eea0a35
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 11:52:07 2010 -0800
tcp: Implement ipv6 ->get_peer() and ->tw_get_peer().
Now ipv6 timewait recycling is fully implemented and
enabled.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 493f377d6dd56f4e98b198d637fe714ab124681b
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 12:14:29 2010 -0800
tcp: Add timewait recycling bits to ipv6 connect code.
This will also improve handling of ipv6 tcp socket request
backlog when syncookies are not enabled. When backlog
becomes very deep, last quarter of backlog is limited to
validated destinations. Previously only ipv4 implemented
this logic, but now ipv6 does too.
Now we are only one step away from enabling timewait
recycling for ipv6, and that step is simply filling in
the implementation of tcp_v6_get_peer() and
tcp_v6_tw_get_peer().
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:45 2010 +0100
b43: N-PHY: fix RSSI calibration
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c1d5a7a2230a162af709fa118f051e0d18ff427
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:44 2010 +0100
b43: N-PHY: initialize perical variable, add missing call to CCA reset
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 161d540c8ef31e5adbced3248873024476e2c26f
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:43 2010 +0100
b43: N-PHY: implement very basic TX power control management
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 40277cabfee7c8ef45055155895dcbef0f983c63
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:42 2010 +0100
b43: N-PHY: swap values for radio registers 0x3b and 0x3c
Specs were updated plus we become wl compatible.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aa3bf280dd3214db5b9e1f8cad7c5868ccbe71b7
Author: Hauke Mehrtens <hauke(a)hauke-m.de>
Date: Sun Nov 28 12:22:52 2010 +0100
ssb: Add sysfs attributes to ssb devices
Make it possible to read out the attributes, till now only show on
dmesg, through sysfs.
This patch was some time in OpenWrt.
Signed-off-by: Bernhard Loos <bernhardloos(a)googlemail.com>
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 172c69a47675dc1ca9c7243c031d8d77701bccc0
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 10:39:35 2010 +0100
ssb: extract indexes for power tables
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Acked-by: Michael Buesch <mb(a)bu3sch.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae4694b2d3e4c0f47c0e804a68417be57e5daf85
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 10:59:22 2010 -0800
ipv6: Create inet6_csk_route_req().
Brother of ipv4's inet_csk_route_req().
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 15c054251ab84895ec043e90826612c1a3d6d4f1
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 10:16:06 2010 -0800
ipv6: Add rt6_get_peer() helper.
To go along side ipv4's rt_get_peer().
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9f28ebc381ca00af0f9033a29776775068344b06
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Fri Nov 26 13:24:19 2010 -0800
iwlagn: name change for bt_ch_announce module parameter
Change the module parameter name to bt_ch_inhibition from
bt_ch_announce to better describe the functionality
In order to allow Bluetooth to activate a smart AFH mechanism
and to maximize its available bandwidth the WiFi will request
BT Core to inhibit its activity in channels that interfere
with WiFi activity (and vice versa) if bt_ch_inhibition is enabled
Set module parameter "bt_ch_inhibition=0" will disable the channel
inhibition function
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit adb90a00371a9a06a55c7b7ed7b38152f8e960c3
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Fri Nov 26 11:09:42 2010 -0800
iwlwifi: check for STATUS_EXIT_PENDING when send RXON command
If driver is on the way down, there is no need to send
RXON to uCode, check the condition before continuous the process.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 8b3ee29626031155c7844988ebe4321c151c03a2
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Thu Nov 18 11:41:48 2010 -0800
iwlagn: remove structure name reference to gen2
Give the corresponding name for .cfg data structure
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit e7cad69cdab4d6f0caadbcdd58b54214243ba98a
Author: Grumbach, Emmanuel <emmanuel.grumbach(a)intel.com>
Date: Thu Nov 18 03:47:38 2010 -0800
iwlagn: Enable PCI L1 ACTIVE state after uCode has been loaded
PCI L1 Active needs to be disabled while loading the uCode so that the bus
doesn't go to sleep. The enablement of L1 Active should be done after
the uCode has sent the ALIVE response. The enablement of L1 Active was
missing.
Enabling L1 Active allows to save power if the BIOS / bus driver allows
it.
I measured the power consumption while not associated and
idle/associated:
L1 Active disabled: 39 mA = 130mW
L1 Active enabled: 6 mA = 20 mW
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 40b97c2fe96a476f1c228345f0c6a2d135a8b226
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 14:17:53 2010 -0800
iwlagn: fix race condition when reprogram sta
During reprogram stations, do not send link quality command.
uCode will crash if receive link quality command for invalid station
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit ccb7c410ddc054b8c1ae780319bc98ae092d3854
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 1 18:09:13 2010 -0800
timewait_sock: Create and use getpeer op.
The only thing AF-specific about remembering the timestamp
for a time-wait TCP socket is getting the peer.
Abstract that behind a new timewait_sock_ops vector.
Support for real IPV6 sockets is not filled in yet, but
curiously this makes timewait recycling start to work
for v4-mapped ipv6 sockets.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4399ce402c7c837dec80bf9fb40d079b39b9265a
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 1 17:29:08 2010 -0800
inetpeer: Fix incorrect comment about inetpeer struct size.
Now with ipv6 support it is no longer less than 64 bytes.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8790ca172a1550949804a2ad59ccea310f680c9f
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 1 17:28:18 2010 -0800
inetpeer: Kill use of inet_peer_address_t typedef.
They are verboten these days.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit be21871f24b0fcd8d0d09c8090385c9cec80efa3
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:26 2010 +0200
Bluetooth: clean up legal text
Remove extra spaces from legal text so that legal stuff looks
the same for all bluetooth code.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 70f23020e6d89155504b5b39f22505f4aec6fa6f
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:25 2010 +0200
Bluetooth: clean up hci code
Do not use assignment in IF condition, remove extra spaces,
fixing typos, simplify code.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 894718a6be69d8cfd191dc291b42be32a1e4851b
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:24 2010 +0200
Bluetooth: clean up l2cap code
Do not initialize static vars to zero, macros with complex values
shall be enclosed with (), remove unneeded braces.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 285b4e90318dcf421a00b2ac3fe8ab713f3281e3
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:23 2010 +0200
Bluetooth: clean up rfcomm code
Remove extra spaces, assignments in if statement, zeroing static
variables, extra braces. Fix includes.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 735cbc4784a084b7a76c43c69f9dba683bb3b48b
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:22 2010 +0200
Bluetooth: clean up sco code
Do not use assignments in IF condition, remove extra spaces
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit b78d7b4f204a6ba1901af36c95e10fded9816054
Author: Anderson Lizardo <anderson.lizardo(a)openbossa.org>
Date: Mon Nov 29 12:15:50 2010 -0400
Bluetooth: Fix error handling for l2cap_init()
create_singlethread_workqueue() may fail with errors such as -ENOMEM. If
this happens, the return value is not set to a negative value and the
module load will succeed. It will then crash on module unload because of
a destroy_workqueue() call on a NULL pointer.
Additionally, the _busy_wq workqueue is not being destroyed if any
errors happen on l2cap_init().
Signed-off-by: Anderson Lizardo <anderson.lizardo(a)openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit eeb366564be7c311b31c70821d18a43a8a57f9bc
Author: Gustavo F. Padovan <padovan(a)profusion.mobi>
Date: Mon Nov 1 18:43:53 2010 +0000
Bluetooth: Get rid of __rfcomm_get_sock_by_channel()
rfcomm_get_sock_by_channel() was the only user of this function, so I merged
both into rfcomm_get_sock_by_channel(). The socket lock now should be hold
outside of rfcomm_get_sock_by_channel() once we hold and release it inside the
same function now.
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit e0f0cb56364958223f0cb1f1b0b0eecf1b8dcb95
Author: Gustavo F. Padovan <padovan(a)profusion.mobi>
Date: Mon Nov 1 18:43:53 2010 +0000
Bluetooth: Get rid of __l2cap_get_sock_by_psm()
l2cap_get_sock_by_psm() was the only user of this function, so I merged
both into l2cap_get_sock_by_psm(). The socket lock now should be hold
outside of l2cap_get_sock_by_psm() once we hold and release it inside the
same function now.
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit cc11b9c14da4ca1c545b424dae2ae8fb1ab04063
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Mon Nov 22 13:21:37 2010 +0200
Bluetooth: do not use assignment in if condition
Fix checkpatch errors like:
"ERROR: do not use assignment in if condition"
Simplify code and fix one long line.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Acked-by: Ville Tervo <ville.tervo(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 940a9eea80946b64b96bd8af1fc71b30c602d057
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Nov 3 12:32:45 2010 +0200
Bluetooth: timer check sk is not owned before freeing
In timer context we might delete l2cap channel used by krfcommd.
The check makes sure that sk is not owned. If sk is owned we
restart timer for HZ/5.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit a49184c229535ebedbb659214db2d4d1d77b7c07
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Nov 3 12:32:44 2010 +0200
Bluetooth: Check sk is not owned before freeing l2cap_conn
Check that socket sk is not locked in user process before removing
l2cap connection handler.
lock_sock and release_sock do not hold a normal spinlock directly but
instead hold the owner field. This means bh_lock_sock can still execute
even if the socket is "locked". More info can be found here:
http://www.linuxfoundation.org/collaborate/workgroups/networking/socketlocks
krfcommd kernel thread may be preempted with l2cap tasklet which remove
l2cap_conn structure. If krfcommd is in process of sending of RFCOMM reply
(like "RFCOMM UA" reply to "RFCOMM DISC") then kernel crash happens.
...
[ 694.175933] Unable to handle kernel NULL pointer dereference at virtual address 00000000
[ 694.184936] pgd = c0004000
[ 694.187683] [00000000] *pgd=00000000
[ 694.191711] Internal error: Oops: 5 [#1] PREEMPT
[ 694.196350] last sysfs file: /sys/devices/platform/hci_h4p/firmware/hci_h4p/loading
[ 694.260375] CPU: 0 Not tainted (2.6.32.10 #1)
[ 694.265106] PC is at l2cap_sock_sendmsg+0x43c/0x73c [l2cap]
[ 694.270721] LR is at 0xd7017303
...
[ 694.525085] Backtrace:
[ 694.527587] [<bf266be0>] (l2cap_sock_sendmsg+0x0/0x73c [l2cap]) from [<c02f2cc8>] (sock_sendmsg+0xb8/0xd8)
[ 694.537292] [<c02f2c10>] (sock_sendmsg+0x0/0xd8) from [<c02f3044>] (kernel_sendmsg+0x48/0x80)
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit d31dbf6e5989b2fd9a30ec5b25436e94f009d6df
Author: Vasiliy Kulikov <segooon(a)gmail.com>
Date: Sat Oct 30 18:26:31 2010 +0400
Bluetooth: hidp: fix information leak to userland
Structure hidp_conninfo is copied to userland with version, product,
vendor and name fields unitialized if both session->input and session->hid
are NULL. It leads to leaking of contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon(a)gmail.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 3185fbd9d7bb166992f072440b3329f58bf2c60a
Author: Vasiliy Kulikov <segooon(a)gmail.com>
Date: Sat Oct 30 18:26:26 2010 +0400
Bluetooth: cmtp: fix information leak to userland
Structure cmtp_conninfo is copied to userland with some padding fields
unitialized. It leads to leaking of contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon(a)gmail.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 5520d20f68310fc158dcbbecfd5eac5cdfc5a241
Author: Vasiliy Kulikov <segooon(a)gmail.com>
Date: Sat Oct 30 18:26:21 2010 +0400
Bluetooth: bnep: fix information leak to userland
Structure bnep_conninfo is copied to userland with the field "device"
that has the last elements unitialized. It leads to leaking of
contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon(a)gmail.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 127178d24c7eb2df53b1ba2b6f6f743e88178a1b
Author: Johan Hedberg <johan.hedberg(a)nokia.com>
Date: Thu Nov 18 22:22:29 2010 +0200
Bluetooth: Automate remote name requests
In Bluetooth there are no automatic updates of remote device names when
they get changed on the remote side. Instead, it is a good idea to do a
manual name request when a new connection gets created (for whatever
reason) since at this point it is very cheap (no costly baseband
connection creation needed just for the sake of the name request).
So far userspace has been responsible for this extra name request but
tighter control is needed in order not to flood Bluetooth controllers
with two many commands during connection creation. It has been shown
that some controllers simply fail to function correctly if they get too
many (almost) simultaneous commands during connection creation. The
simplest way to acheive better control of these commands is to move
their sending completely to the kernel side.
This patch inserts name requests into the sequence of events that the
kernel performs during connection creation. It does this after the
remote features have been successfully requested and before any pending
authentication requests are performed. The code will work sub-optimally
with userspace versions that still do the name requesting themselves (it
shouldn't break anything though) so it is recommended to combine this
with a userspace software version that doesn't have automated name
requests.
Signed-off-by: Johan Hedberg <johan.hedberg(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 392599b95d76f4f3102d8614bdc1957795cd1a3a
Author: Johan Hedberg <johan.hedberg(a)nokia.com>
Date: Thu Nov 18 22:22:28 2010 +0200
Bluetooth: Create a unified authentication request function
This patch adds a single function that's responsible for requesting
authentication for outgoing connections. This is preparation for the
next patch which will add automated name requests and thereby move the
authentication requests to a different location.
Signed-off-by: Johan Hedberg <johan.hedberg(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit ccd556fe334914bf2e465eb5bc480d49cd4406d7
Author: Johan Hedberg <johan.hedberg(a)nokia.com>
Date: Wed Nov 10 17:11:51 2010 +0200
Bluetooth: Simplify remote features callback function logic
The current remote and remote extended features event callbacks logic
can be made simpler by using a label and goto statements instead of the
current multiple levels of nested if statements.
Signed-off-by: Johan Hedberg <johan.hedberg(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 17f490bcedd7b6677140b2d49efe9e9e6b84de60
Merge: 61790c5 be93112
Author: Gustavo F. Padovan <padovan(a)profusion.mobi>
Date: Wed Dec 1 21:04:09 2010 -0200
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
commit 67d5288049f46f816181f63eaa8f1371877ad8ea
Author: Jon Mason <jon.mason(a)exar.com>
Date: Mon Nov 29 18:02:47 2010 +0000
vxge: update driver version
Update vxge driver version
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ead5d238146981f922e3848fac83825d87c518f0
Author: Jon Mason <jon.mason(a)exar.com>
Date: Mon Nov 29 18:02:46 2010 +0000
vxge: use strcpy for strings
Use strncpy instead of memcpy when working on strings
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1bacdbb341e8c92c58651f06727318c3d0c1c30e
Author: Jon Mason <jon.mason(a)exar.com>
Date: Mon Nov 29 18:02:45 2010 +0000
vxge: remove unnecessary printks
Remove printks for ring blocks, fifo blocks, and rx doorbell mode as
they clutter the dmesg output during modprobe and provide no useful
information.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8afe7c8acd33bc52c56546e73e46e9d546269e2c
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 29 09:47:49 2010 +0000
ipip: add module alias for tunl0 tunnel device
If ipip is built as a module the 'ip tunnel add' command would fail because
the ipip module was not being autoloaded. Adding an alias for
the tunl0 device name cause dev_load() to autoload it when needed.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4da6a738ffdb99b88efbe5b4c4fe521ca453640d
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 29 09:47:48 2010 +0000
gre: add module alias for gre0 tunnel device
If gre is built as a module the 'ip tunnel add' command would fail because
the ip_gre module was not being autoloaded. Adding an alias for
the gre0 device name cause dev_load() to autoload it when needed.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 29 09:47:47 2010 +0000
gre: minor cleanups
Use strcpy() rather the sprintf() for the case where name is getting
generated. Fix indentation.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f2cd2d3e9b3ef960612e362f0ad129d735452df2
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 29 08:14:37 2010 +0000
net sched: use xps information for qdisc NUMA affinity
Allocate qdisc memory according to NUMA properties of cpus included in
xps map.
To be effective, qdisc should be (re)setup after changes
of /sys/class/net/eth<n>/queues/tx-<n>/xps_cpus
I added a numa_node field in struct netdev_queue, containing NUMA node
if all cpus included in xps_cpus share same node, else -1.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Ben Hutchings <bhutchings(a)solarflare.com>
Cc: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0793f83f0ec2142d06abe53570417c8d95e0310a
Author: Dmitry Kravkov <dmitry(a)broadcom.com>
Date: Wed Dec 1 12:39:28 2010 -0800
bnx2x: Add Nic partitioning mode (57712 devices)
NIC partitioning is another flavor of multi function - having few
PCI functions share the same physical port. Unlike the currently
supported mode of multi-function which depends on the switch
configuration and uses outer-VLAN, the NPAR mode is switch independent
and uses the MAC addresses to distribute incoming packets to the different
functions. This patch adds the specific HW setting of the NPAR mode
and some distinctions between switch dependent (SD) and
switch independent (SI) multi-function (MF) modes where the configuration
is not the same.
Advance driver version to 1.60.00-6
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3f419d2d487821093ee46e898b5f8747f9edc9cd
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 29 13:37:14 2010 -0800
inet: Turn ->remember_stamp into ->get_peer in connection AF ops.
Then we can make a completely generic tcp_remember_stamp()
that uses ->get_peer() as a helper, minimizing the AF specific
code and minimizing the eventual code duplication when we implement
the ipv6 side of TW recycling.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b3419363808f2481b24a817f491878e1795db4c7
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:27:11 2010 -0800
ipv6: Add infrastructure to bind inet_peer objects to routes.
They are only allowed on cached ipv6 routes.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 672f007d65f50468a4a1e55825fe58e5b035324d
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:20:00 2010 -0800
inetpeer: Add inet_getpeer_v6()
Now that all of the infrastructure is in place, we can add
the ipv6 shorthand for peer creation.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 021e9299113363cc1b713f86b2cba30b8e6cb5dd
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:12:23 2010 -0800
inetpeer: Add v6 peers tree, abstract root properly.
Add the ipv6 peer tree instance, and adapt remaining
direct references to 'v4_peers' as needed.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 026630450244b8f8d1baf54548be0800aa1823ed
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:08:53 2010 -0800
inetpeer: Abstract address comparisons.
Now v4 and v6 addresses will both work properly.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b534ecf1cd26f094497da6ae28a6ab64cdbe1617
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 11:54:19 2010 -0800
inetpeer: Make inet_getpeer() take an inet_peer_adress_t pointer.
And make an inet_getpeer_v4() helper, update callers.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 582a72da9a41be9227dc931d728ae2906880a589
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 11:53:55 2010 -0800
inetpeer: Introduce inet_peer_address_t.
Currently only the v4 aspect is used, but this will change.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 98158f5a853cafd33b254ae0eacc0dd69f90b93b
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 11:41:59 2010 -0800
inetpeer: Abstract out the tree root accesses.
Instead of directly accessing "peer", change to code to
operate using a "struct inet_peer_base *" pointer.
This will facilitate the addition of a seperate tree for
ipv6 peer entries.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 61790c5f3c5f158821821a00797d94504531839f
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Tue Nov 30 15:33:40 2010 +0100
iwlagn: fix microcode error on 4965
Commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 "iwlwifi: use
antenna information in EEPROM" caused 4965 device breakage with
"Microcode SW error detected. Restarting 0x82000000." message.
This patch reverts 4965 part of that commit.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Johannes Berg <johannes(a)sipsolutions.net>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 08ca944eb240b2299e743c76b43fbc7c2dd251de
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Tue Nov 30 12:19:34 2010 +0100
mac80211: Minor optimization in ieee80211_rx_h_data
Remove a superfluous ieee80211_is_data check as that was checked a few
lines before already and we wont't get here for non-data frames at all.
Second, the frame was already converted to 802.3 header format and
reading the fc and addr1 fields was only possible because the 802.3
header is short enough and didn't overwrite the relevant parts of the
802.11 header. Make the code more obvious by checking the ethernet
header's h_dest field.
Furthermore reorder the conditions to reduce the number of checks
when dynamic powersave is not needed (AP mode for example).
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Reviewed-by: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 20ed3166c84d145589a89d8cde12aa32cf2d17f4
Author: Johannes Stezenbach <js(a)sig21.net>
Date: Tue Nov 30 16:49:23 2010 +0100
mac80211/rt2x00: add ieee80211_tx_status_ni()
All rt2x00 drivers except rt2800pci call ieee80211_tx_status() from
a workqueue, which causes "NOHZ: local_softirq_pending 08" messages.
To fix it, add ieee80211_tx_status_ni() similar to ieee80211_rx_ni()
which can be called from process context, and call it from
rt2x00lib_txdone(). For the rt2800pci special case a driver
flag is introduced.
Signed-off-by: Johannes Stezenbach <js(a)sig21.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4352fab5c2a1a602447d711c84d149bf2f0bc7ba
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:53:28 2010 +0200
ath5k: Set turbo bit on rf bank 2
* A diff between rfbuffer settings of turbo and non-turbo
modes indicates there is a bit on bank 2 related to turbo operation
(it's set on turbo modes). This bit is present on all radios except
RF5413 that seems to have a completely different bank 2. Also
since 2317 has the same rf-registers locations with 2425 and
since the bit exists on 2317 I assume it also exists on 2425/2417).
So in case we use turbo mode (40MHz) enable it on bank modification.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c2b418a07b4dc77d7efadb890ba9ad1a4161c3f
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:51:38 2010 +0200
ath5k: Clean up turbo mode initvals/rfregs
* Clean up what's left of turbo mode, since we handle all
register modifications (rfbuffer comes next) on code there
is no need to have duplicated arrays.
* Rename change_channel to skip_pcu on initvals.c as we did
on reset.c
Signed-off-by: Nick Kossifidis <micklfemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit acb091d67c5c9649cf5d25055ef6fd64239a6762
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:49:53 2010 +0200
ath5k: Cleanup turbo channel flags
* Clean up CHANNEL_T(URBO), use AR5K_BWMODE_40MHZ instead
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 73a06a683455f472cc09ad249064c66a41e29e39
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:48:32 2010 +0200
ath5k: Use correct clock when setting ofdm timings
* Use correct clock value when setting OFDM timings on
non-default bwmodes.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3bb17654605965226e5b322dbc22ece5ff354ac5
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:45:21 2010 +0200
ath5k: Skip tx power setting on AR5210 for now
* Don't return -EINVAL when trying to set tx power
on RF5110 because AR5210 reset will fail. We need to
add support for RF5110 and AR5210 eeprom in the future
but for now just skip it.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b02f5d1a17c652a74098f2a04db7fb8e6220057e
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:44:02 2010 +0200
ath5k: Tweak phy activate to rx start delay based on bwmode
* Tweak phy activation -> rx delay for different bwmodes
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c2b0ebef262e0a9b64f7ea8ec837cfc29605bef7
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:42:22 2010 +0200
ath5k: No need to save/restore staid flags on reset
* Since we set antenna flags on phy init and ack bitrate
mode on pcu init, there is no need to save/restore sta_id
flags on ath5k_hw_reset. Also we don't need to re-set our
mac address because it's not affected by resets.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8aec7af99b1e4594c4bb9e1c48005e6111f97e8e
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:39:28 2010 +0200
ath5k: Support synth-only channel change for AR2413/AR5413
* Add synth-only channel change for AR2413/5413. When we call
ath5k_reset with a channel ath5k_hw_reset will first try to
set channel on PHY while PHY is running instead of doing a normal
full reset. To do this phy_init has to change to implement this
functionality.
* Clean up change_channel flag, what it really did was skip PCU
registers when setting initvals. This is done because on reset
PCU registers are not affected (except the registers we set
in pcu init and -due to hw problems- TSF). Use a new skip_pcu
flag that's not misleading instead. In the future we might use
that to also skip PCU reset and save us the TSF etc problems
(needs testing because standard practice is to reset everything).
* Use fast channel change only when setting channel, and set skip_pcu
to false only on init. When we reset the card due to DMA or PHY
problems skip pcu but never do a fast channel change.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4c57581d939fd0f8f244b9730812069f4dac308a
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:37:30 2010 +0200
ath5k: Skip powertable setting when we are on the same channel
* Only set power table if we are changing channel/mode
there is no need to recalculate and reset the power table
all the time.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f08fbf6cf4a31c8df52b21440c7a7e6fbe474b28
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:33:22 2010 +0200
ath5k: Update PLL programming for turbo/half/quarter
* Set correct PLL settings for each bwmode
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a2677fe4298c61f0e93c063e59815bf21c530c4a
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:28:15 2010 +0200
ath5k: Update spur mitigation filter for turbo/half/quarter
* Add spur mitigation filter support for half/quarter and turbo.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2b4c69f682a2868411899a77842061dd745884f
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:26:13 2010 +0200
ath5k: Tweak power detector delays on RF5111/RF5112
* Tweak power detector delays on AR5111/AR5112 when
using half/quarter modes.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 71ba1c30851575b43ba76b0f9c26ff5567e8136c
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:24:54 2010 +0200
ath5k: Always set IFS intervals on reset
* Make sure we always set IFS timings even if no
coverage class is set. If we don't we'll miss the
needed changes for different bwmodes.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 473cae27620c27377e278a6f92aaa483060e3c19
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:21:50 2010 +0200
ath5k: Use turbo flag on DCU
* Set AR5K_DCU_GBL_IFS_MISC_TURBO_MODE flag on DCU when operating
on 40MHz
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eeb8832b3181d6ca8593051b68c466e5d2653bb3
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:19:45 2010 +0200
ath5k: Set all IFS intervals, not just slot time
* Replace set_slot_time with set_ifs_intervals that also sets
the various inter-frame space intervals based on current bwmode.
* Clean up AR5210 mess from reset_tx_queue, AR5210 only has one
data queue and we set IFS intervals for that queue on set_ifs_intervals
so there is nothing left to do for 5210 on reset_tx_queue.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 61cde037234c4b8e6497a23f5f236c64cbf9d41d
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:12:23 2010 +0200
ath5k: Extend rate_duration
* Extend ieee80211_generic_frame_duration to support the various
bwmodes.
* Better document what's going on with ack bitrates and update
write_rate_duration to support the standard ack bitrates (when
we don't set the high bit).
* Get rid of set_ack_bitrate_high and introduce a flag on ath5k_hw
for this (we only called the function on init anyway so there is no
difference).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3017fcab416d8d1ee48ca16aa9a3062f600dab8e
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:09:11 2010 +0200
ath5k: Extend get_default_sifs/slot_time
* Extend get_default_sifs/slot_time to include timings for turbo
half and quarter rate modes.
* AR5210 code for now uses timings already on core clock units
instead of usecs so rename them (we 'll clean it up later).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 25ddfa195735934256fda55bb4f2d749c19386ff
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:07:04 2010 +0200
ath5k: Move tx retries setting outside reset_tx_queue
* Move setting of tx retry limits on a separate function
(we 'll clean up this AR5210 mess later)
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b405086ba47678a5b8f6e7cd835a3d27ebb6f744
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:04:43 2010 +0200
ath5k: Increase PHY settling parameters for turo mode
* On turbo mode increase PHY settling times, note that
we only increase switch settling time on AR5212 as indicated
by initvals.
* A few cleanups: Move frame control settings for AR5210 from
reset_tx_queue to tweak_initvals and remove phy_scal settings
from tweak_initvals (we tweak them alread on set_sleep_clock).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 325089ab5847f5c1e43f42bb90d32f981867c4c1
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:02:20 2010 +0200
ath5k: Small cleanup on tweak_initvals
* Now that we properly set rx/tx latencies for AR5311 remove
that old buggy part of code left inside ath5k_hw_tweak_initval_settings
that was never executed (you can't have an RF5112 radio on a mac older
than AR5212). Also use a magic value for 5311 PHY_SCAL value.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c297560206adf0cda8ce38ef9b20b0a025754c4d
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:00:37 2010 +0200
ath5k: Put core clock initialization on a new function
* Handle all usec parameters in one function. It's much cleaner
this way.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fa3d2feeff4723cce8d4722902492d60b7f75fcc
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:58:34 2010 +0200
ath5k: Add new field on ath5k_hw to track bandwidth modes
* Prepare for half/quarter/turbo support, introduce a new
ah_bwmode parameter and get rid of ah_turbo. Bwmode stands
for "bandwidth mode" and can have 4 values, default (20MHz),
turbo (40MHz), half rate (10MHz), and quarter rate (5MHz).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 14fae2d4b61b890cea58d63091406b86ec9bafcd
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:55:17 2010 +0200
ath5k: Use new function to stop beacon queue
* Since we only use ath5k_hw_stop_tx_dma to stop the beacon
queue, introduce a new function ath5k_hw_stop_beacon_queue so
that we can use that instead and have better control. In the future
we can add more beacon queue specific stuff there (maybe tweak
beacon timers or something), for now just call ath5k_hw_stop_tx_dma.
* Also since we don't call ath5k_hw_stop_rx/tx_dma from outside
dma.c, make them static.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e8325ed87457e07b9ceeb1e7a31df787dd7ee106
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:52:24 2010 +0200
ath5k: Check RXE when setting RXDP
* Make sure we are not trying to set RXDP while RX is active,
for now ignore the return value.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f7317ba2d669c1b54fb31ed7834361a700a79217
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:50:16 2010 +0200
ath5k: Use DCU early termination correctly
* DCU early termination should be used to quickly flush QCU
according to docs so don't enable it for all queues, enable
it only when stopping each queue and disable it when we are
done.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b3a28e68d5c8d788a4e538a119a5d326545add8a
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:47:31 2010 +0200
ath5k: Debug DMA timeouts
* Increase timeouts on ath5k_hw_stop_tx_dma and also wait for
tx queue to stop before checking for pending frames
* Add a new debug level to debug dma start/stop
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 80dac9eecbdb95f61b9b3c7081e02412155982b7
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:45:38 2010 +0200
ath5k: Use new dma_stop function on base.c
* Since we stop rx/tx dma and pcu durring reset there is no need to
call ath5k_hw_stop_rx/tx_dma before, also there is no need to call
them durring stop_locked since we can use ath5k_hw_dma_stop for
both.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e088f23be166635b3938571c00c686094efa7cc4
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:43:18 2010 +0200
ath5k: Stop PCU on reset
* Stop PCU receive logic (DRU) durring reset
We need to be sure pcu is not active when trying to stop rx dma
right now this is done on ath5k_reset (base.c) but later we are
going to clean it up.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d41174fabdae348c6583cf05aeb329da232c342c
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:41:15 2010 +0200
ath5k: Add new function to stop rx/tx DMA
* Add a new function to stop rx/tx dma and use in when reset starts
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9320b5c4a7260d9593102f378201d17e3f030739
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:36:45 2010 +0200
ath5k: Reset cleanup and generic cleanup
* No functional changes
* Clean up reset:
Introduce init functions for each unit and call them instead
of having everything inside ath5k_hw_reset (it's just c/p for
now so nothing changes except calling order -I tested it with
various cards and it's ok-)
* Further cleanups:
ofdm_timings belongs to phy.c
rate_duration belongs to pcu.c
clock functions are general and belong to reset.c (more to follow)
* Reorder functions for better organization:
We start with helpers and other functions follow in categories,
init functions are last
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ea066d5a91f2610116dcd27054f749e4f07799d8
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Nov 23 20:42:27 2010 +0530
ath9k: Add support for Adaptive Power Management
This feature is to mitigate the problem of certain 3
stream chips that exceed the PCIe power requirements.An EEPROM flag
controls which chips have APM enabled which is basically read from
miscellaneous configuration element of the EEPROM header.
This workaround will reduce power consumption by using 2 Tx chains for
Single and Double stream rates (5 GHz only).All self generated frames
(regardless of rate) are sent on 2 chains when this feature is
enabled(Chip Limitation).
Cc: Paul Shaw <paul.shaw(a)atheros.com>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Tested-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dd318575ff0aae91ac4cbcc5b60c184e59267212
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Mon Nov 29 11:09:16 2010 +0100
mac80211: fix RX aggregation locking
The RX aggregation locking documentation was
wrong, which led Christian to also code the
timer timeout handling for it somewhat wrongly.
Fix the documentation, the two places that
need to hold the reorder lock across accesses
to the structure, and the debugfs code that
should just use RCU.
Also, remove acquiring the sta->lock across
reorder timeouts since it isn't necessary, and
change a few places to GFP_KERNEL because the
code path here doesn't need atomic allocations
as I noticed when reviewing all this.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Acked-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8b7f8532d15631776ce8bec2bbbc58f6aad738d1
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 28 19:37:48 2010 +0100
ath9k: fix software retry counter tracking
The recent tx path cleanups moved the software retry count tracking
from the ath_buf to the skb cb, however the actual counter update
referred to the wrong location, confusing block-ack window tracking.
Fix this by using the retries counter in the struct ath_frame_info.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 81fc2a332045dc1dae24f24d3e2dc4656f2cc498
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 26 23:24:33 2010 +0530
Revert "ath9k_htc: Handle monitor mode properly for HTC devices"
This reverts commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb.
The change had broken the packet injection on monitoring mode.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c5e9c830a04ece8f0c35db2c1e0f6d87bd64894
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Fri Nov 26 06:10:07 2010 -0800
ath9k: Remove code which enables btcoex based on subsys id
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8f5dcb1cfb71ce832f53a4723deba72e6695078b
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Fri Nov 26 06:10:06 2010 -0800
ath9k: Reintroduce modparam to enable btcoex
It is not ideal to enable btcoex based on subsys id as it is
not unique, they are so random. It is also a pain keeping
all of them in a table to enable btcoex for a particular
hw. Going back to the old idea.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f30221e4ec62d905b56d5e8f7ccab6b406a97cf5
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Thu Nov 25 10:02:30 2010 +0100
mac80211: implement off-channel mgmt TX
This implements the new off-channel TX API
in mac80211 with a new work item type. The
operation doesn't add a new work item when
we're on the right channel and there's no
wait time so that for example p2p probe
responses will be transmitted without delay.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f7ca38dfe58c20cb1aa2ed9643187e8b194b5bae
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Thu Nov 25 10:02:29 2010 +0100
nl80211/cfg80211: extend mgmt-tx API for off-channel
With p2p, it is sometimes necessary to transmit
a frame (typically an action frame) on another
channel than the current channel. Enable this
through the CMD_FRAME API, and allow it to wait
for a response. A new command allows that wait
to be aborted.
However, allow userspace to specify whether or
not it wants to allow off-channel TX, it may
actually want to use the same channel only.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c20ec76157747434652e721cdd4dccd8654ad370
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:42:02 2010 +0000
forcedeth: Use netdev_dbg for printk(KERN_DEBUG
Use the normal debugging functions.
Print mac address when using random_ether_addr.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ef46ffbc2841dddebe521764c06673474ca5d041
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:42:01 2010 +0000
forcedeth: Remove netdev_dbg uses
These were probably just for initial driver debugging
and have not been enabled in builds in git history.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b2ba08e606dfd106a394c3ac7a56c497b4c8f230
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:42:00 2010 +0000
forcedeth: Convert dev_printk(<level> to dev_<level>(
Use vsprintf extension %pM for a mac address in one instance.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cd66328bdab782ee40d17b573a3067a591cb7b4f
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:59 2010 +0000
forcedeth: Separate vendor specific initializations into functions
Neaten the phy_init function by adding and calling vendor
specific functions.
object size is reduced by ~1kb:
$ size drivers/net/forcedeth.o.*
text data bss dec hex filename
83475 1848 19304 104627 198b3 drivers/net/forcedeth.o.new
84459 1848 19544 105851 19d7b drivers/net/forcedeth.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c41d41e1687dcf344f55dd15c7121532e5c195d4
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:58 2010 +0000
forcedeth: Add function init_realtek_8211b
Deduplicate the code use for the init/reset of this device.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d397f3698ec438c3c14abf45bfac88cca1882d9
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:57 2010 +0000
forcedeth: Convert pr_<level> to netdev_<level>
Use netdev_<level> when a struct net_device * is available.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 294a554e274f961ac33c7d739d5b912bd0005f5b
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:56 2010 +0000
forcedeth: Use pr_fmt and pr_<level>
Convert printks to pr_<level>.
Remove "forcedeth: " from some calls as it's now added by pr_fmt.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f52dafc1a67c98baa9b6fa1866a4caa4be4831fb
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:55 2010 +0000
forcedeth: Convert remaining dprintk to netdev_dbg
The remaining dprintk uses are emitted as KERN_INFO.
Change these dprintk uses to netdev_dbg.
Remove the now unused dprintk macros.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:54 2010 +0000
forcedeth: Use print_hex_dump
Use the standard code to emit hex dumps.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6b80858d2c0a378894b9df35d3703d62b0b12dbc
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:53 2010 +0000
forcedeth: convert dprintk(KERN_DEBUG to netdev_dbg
Use the more standard macro to preface netdev->name.
Fix casting on resource use.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 344d0dce5164d0bf2d73cf10510fe08ed8cf8248
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:52 2010 +0000
forcedeth: Change reg_delay arguments and use
Move the printk out of reg_delay and make
the callers emit a message on error.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 77148625e10d0fda50d05e92d199c0df17b66e9a
Merge: a417786 51cce8a
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 29 11:19:09 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit a41778694806ac1ccd4b1dafed1abef8d5ba98ac
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Nov 28 21:43:02 2010 +0000
xps: add __rcu annotations
Avoid sparse warnings : add __rcu annotations and use
rcu_dereference_protected() where necessary.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b02038a17b271e0f70616c54e4eccb5cc33d1b74
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Nov 28 05:43:24 2010 +0000
xps: NUMA allocations for per cpu data
store_xps_map() allocates maps that are used by single cpu, it makes
sense to use NUMA allocations.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 49b4a6546fac02f58784f0744e0f99a6562ccc03
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Mon Nov 29 00:14:58 2010 +0000
sctp: kill unused macros in head file
1. SCTP_CMD_NUM_VERBS,SCTP_CMD_MAX
These two macros have never been used for several years since v2.6.12-rc2.
2.sctp_port_rover,sctp_port_alloc_lock
The commit 063930 abandoned global variables of port_rover and port_alloc_lock,
but still keep two macros to refer to them.
So, remove them now.
commit 06393009000779b00a558fd2f280882cc7dc2008
Author: Stephen Hemminger <shemminger(a)linux-foundation.org>
Date: Wed Oct 10 17:30:18 2007 -0700
[SCTP]: port randomization
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd
Author: Scott J. Goldman <scottjg(a)vmware.com>
Date: Sat Nov 27 10:33:55 2010 +0000
vmxnet3: fix compilation when RSS is disabled
If RSS is disabled, we can ifdef out some RSS specific code. This fixes
the compile error found by Randy Dunlap.
Signed-off-by: Scott J. Goldman <scottjg(a)vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh(a)vmware.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bf26414510103448ad3dc069c7422462f03ea3d7
Author: Tom Herbert <therbert(a)google.com>
Date: Fri Nov 26 08:36:09 2010 +0000
xps: Add CONFIG_XPS
This patch adds XPS_CONFIG option to enable and disable XPS. This is
done in the same manner as RPS_CONFIG. This is also fixes build
failure in XPS code when SMP is not enabled.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8fa9208e305e24978b897d6ea057604444ce77e1
Author: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Date: Fri Nov 26 02:41:20 2010 +0000
qeth: l3 fix len in tso hdr
The tso hdr is longer then the regular l3 hdr. Fix the calculation
of the total len by accounting the size of the tso hdr.
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2b6203bb7d85e6a2ca2088b8684f30be70246ddf
Author: Ursula Braun <ursula.braun(a)de.ibm.com>
Date: Fri Nov 26 02:41:19 2010 +0000
qeth: enable interface setup if LAN is offline
Device initialization of a qeth device contains a STARTLAN step.
This step may fail, if cable is not yet plugged in. The qeth device
stays in state HARDSETUP until cable is plugged in. This prevents
further preparational initialization steps of the qeth device and
its network interface. This patch makes sure initialization of qeth
device continues, even though cable is not yet plugged in.
Once carrier is available, qeth is notified, triggers a recovery
which results in a working network interface.
Signed-off-by: Ursula Braun <ursula.braun(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cdac082e051136a021f28d0f63c56e916b541253
Author: Joe Perches <joe(a)perches.com>
Date: Fri Nov 26 02:41:18 2010 +0000
drivers/s390/net: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f3aa3136d9c15ff693198eb34701a74bb0b6b969
Author: Sachin Sant <sachinp(a)in.ibm.com>
Date: Fri Nov 26 02:41:17 2010 +0000
qeth lcs: convert mc rwlock to RCU
Commit 1d7138de878d1d4210727c1200193e69596f93b3
igmp: RCU conversion of in_dev->mc_list
converted rwlock to RCU.
Update the s390 network drivers(qeth & lcs) code to adapt to this change.
V2 : Changes based on suggestions given by Eric Dumazet
Signed-off-by: Sachin Sant <sachinp(a)in.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5
Author: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Date: Sun Nov 28 18:10:53 2010 -0800
stmmac: fix stmmac_resume removing not yet used shutdown flag
The commit to convert to use the dev_pm_ops struct
introduces a bug. The shutdown flag is not yet used
because the hibernation on memory is done by using
the freeze callback.
Thanks to Vlad for having reported it.
Reported-by: Vlad Lungu <vlad.lungu(a)windriver.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit de855b992d75e49816eb09231764e7a63a4f555d
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:48 2010 +0000
forcedeth: use usleep_range not msleep for small sleeps
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 34cf97eb255b09751f1eb1b5573813e9ea3fe21f
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:46 2010 +0000
forcedeth: do not use assignment in if conditions
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5504e1397cc860e61fbb68c56e7a10db613275fd
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:45 2010 +0000
forcedeth: include <linux/io.h> and <linux/uaccess.h> instead of <asm/io.h> and <asm/uaccess.h> as suggested by checkpatch
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9b03b06b65856f70564c53654d44053f3072379e
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:44 2010 +0000
forcedeth: remove unnecessary checks before kfree
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 78aea4fc67a7534d5f5bbb0419a2bcb50b0547c9
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:43 2010 +0000
forcedeth: fix multiple code style issues
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 47c05314328d9c40f6006783dc4c1e3080bd2914
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 28 00:02:59 2010 +0000
zd1211rw: document need for kmalloc cast
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e80be0b0ee307a2801e57cf36333d3d659e4bcc6
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 27 23:05:45 2010 +0000
vxge: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f3167460144cd2c24b964a32d40d32f851b5d5f4
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 27 23:05:44 2010 +0000
qlcnic: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0acdf68f495793143802dd4f3e47918dddcceed7
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 27 23:05:43 2010 +0000
netxen: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c661c4a2b0d64c33afc9018a406162b1f8ac5617
Author: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Date: Thu Nov 25 07:53:55 2010 +0000
cxgb3: Removing unused return variable
Currently the ret variable is not used for anything other than
receive the value of the t3_adapter_error(), which will always be 0,
because the reset parameter is 0.
Signed-off-by: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 82a39eb6b3829a02e235656feddb4542517fcabc
Author: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Date: Thu Nov 25 03:15:07 2010 +0000
ipv6: Prepare the tree for un-inlined jhash.
jhash is widely used in the kernel and because the functions
are inlined, the cost in size is significant. Also, the new jhash
functions are slightly larger than the previous ones so better un-inline.
As a preparation step, the calls to the internal macros are replaced
with the plain jhash function calls.
Signed-off-by: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit aa285b1740f5b13e5a2606a927f3129954583d78
Author: Timo Teräs <timo.teras(a)iki.fi>
Date: Tue Nov 23 04:03:45 2010 +0000
xfrm: fix gre key endianess
fl->fl_gre_key is network byte order contrary to fl->fl_icmp_*.
Make xfrm_flowi_{s|d}port return network byte order values for gre
key too.
Signed-off-by: Timo Teräs <timo.teras(a)iki.fi>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6a632625c7da7594d059b88dae0e9c591af147ba
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:32 2010 +0000
ethoc: remove division from loops
Calculating the BD entry using a modulus operation isn't optimal, especially
inside the loop. This patch removes the modulus operations in favour of:
i) simply checking for wrapping in the case of cur_rx
ii) forcing num_tx to be a power of two and using it to mask out the
entry from cur_tx
The also prevents possible issues related overflow of the cur_rx and cur_tx
counters.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:31 2010 +0000
ethoc: fix function return type
update_ethoc_tx_stats doesn't need to return anything so make its return
type void in order to avoid an unnecessary cast when the function is called.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8dac428ae9ae54d8e8540ac157d92925dd7ebed8
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:30 2010 +0000
ethoc: rework mdio read/write
MDIO read and write were checking whether a timeout had expired to determine
whether to recheck the result of the MDIO operation. Under heavy CPU usage,
however, it was possible for the timeout to expire before the routine got
around to be able to check a second time even, thus erroneousy returning an
-EBUSY.
This patch changes the the MDIO IO routines to try up to five times to complete
the operation before giving up, thus lessening the dependency on CPU load.
This resolves a problem whereby a ping flood would keep the CPU so busy that
the above problem would manifest itself; the MDIO command to check link status
would fail and the interface would erroneously be shut down.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fa98eb0e867c6c16e239545d4deb7ad8f40631b3
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:29 2010 +0000
ethoc: rework interrupt handling
The old interrupt handling was incorrect in that it did not account for the
fact that the interrupt source bits get set irregardless of whether or not
their corresponding mask is set. This patch fixes that by masking off the
source bits for masked interrupts.
Furthermore, the handling of transmission events is moved to the NAPI polling
handler alongside the reception handler, thus preventing a whole bunch of
interrupts during heavy traffic.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 20f70ddd6558a39a89dba4af675686c5a8dbd7b3
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:28 2010 +0000
ethoc: Double check pending RX packet
An interrupt may occur between checking bd.stat and clearing the
interrupt source register which would result in the packet going totally
unnoticed as the interrupt will be missed. Double check bd.stat after
clearing the interrupt source register to guard against such an
occurrence.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7438a5455734d109fdf18d97147dc57a6dbe5a44
Author: Adam Edvardsson <adam.edvardsson(a)orsoc.se>
Date: Thu Nov 25 02:30:27 2010 +0000
ethoc: enable interrupts after napi_complete
Occasionally, it seems that some race is causing the interrupts to not be
reenabled otherwise with the end result that networking just stops working.
Enabling interrupts after calling napi_complete is more in line with what
other drivers do.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit eac0d3ff5a92de410964fdf0d072314821ca39fc
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:26 2010 +0000
ethoc: remove unused spinlock
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e0f4258be2515afce8ef1e6fb22312525c281798
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:25 2010 +0000
ethoc: Add device tree configuration
This patch adds the ability to describe ethernet devices via a flattened
device tree. As device tree remains an optional feature, these bits all
need to be guarded by CONFIG_OF ifdefs.
MAC address is settable via the device tree parameter "local-mac-address";
however, the selection of the phy id is limited to probing, for now.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3f0a069a1d5c0ccace735e3a62c1bcef53e4c354
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:45 2010 +0000
X25 remove bkl in call user data length ioctl
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 74a7e440807d34e586e9feb8e14851b5c80fbfe5
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:43 2010 +0000
X25 remove bkl from causediag ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5b7958dfa5db758e36e92e1790075b470b4947f8
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:40 2010 +0000
X25 remove bkl from calluserdata ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f90de660678cf553f63c387945830a2e4d26dd3e
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:35 2010 +0000
X25 remove bkl in facility ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5595a1a5997953dbd8c5df7c2f7d4b3a2eb2be4b
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:15 2010 +0000
X25 remove bkl in subscription ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5892b9e9ebdde50fbd524570d61ceb74f8be33f3
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Sun Nov 28 00:23:35 2010 +0000
bnx2x: Use helpers instead of direct access to the shinfo(skb) fields
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit be7ff1afec25f2700ca85e3956a2cb3a7b74acd5
Author: Michael Chan <mchan(a)broadcom.com>
Date: Wed Nov 24 13:48:55 2010 +0000
bnx2: Remove config access to non-standard registers
In KVM passthrough mode, the driver may not have config access to
non-standard registers. The BNX2_PCICFG_MISC_CONFIG config register
access to setup mailbox swapping can be done using MMIO.
Update version to 2.0.20.
Signed-off-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a5dac108d57072eec4d6745f32c162524509f2cb
Author: Eddie Wai <waie(a)broadcom.com>
Date: Wed Nov 24 13:48:54 2010 +0000
bnx2: Fix reset bug on 5709
The 5709 chip requires the BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE bit to be
cleared and polling for pending DMAs to complete before chip reset.
Without this step, we've seen NMIs during repeated resets of the chip.
Signed-off-by: Eddie Wai <waie(a)broadcom.com>
Signed-off-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 19eb5cc559f716dc98ce03a5bad6030fdc71e897
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Wed Nov 24 13:14:50 2010 +0000
8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues
Now that the vlan device is lockless and single queue do not
transfer the real num queues. This is causing a BUG_ON to occur.
kernel BUG at net/8021q/vlan.c:345!
Call Trace:
[<ffffffff813fd6e8>] ? fib_rules_event+0x28/0x1b0
[<ffffffff814ad2b5>] notifier_call_chain+0x55/0x80
[<ffffffff81089156>] raw_notifier_call_chain+0x16/0x20
[<ffffffff813e5af7>] call_netdevice_notifiers+0x37/0x70
[<ffffffff813e6756>] netdev_features_change+0x16/0x20
[<ffffffffa02995be>] ixgbe_fcoe_enable+0xae/0x100 [ixgbe]
[<ffffffffa01da06a>] vlan_dev_fcoe_enable+0x2a/0x30 [8021q]
[<ffffffffa02d08c3>] fcoe_create+0x163/0x630 [fcoe]
[<ffffffff811244d5>] ? mmap_region+0x255/0x5a0
[<ffffffff81080ef0>] param_attr_store+0x50/0x80
[<ffffffff810809b6>] module_attr_store+0x26/0x30
[<ffffffff811b9db2>] sysfs_write_file+0xf2/0x180
[<ffffffff8114fc88>] vfs_write+0xc8/0x190
[<ffffffff81150621>] sys_write+0x51/0x90
[<ffffffff8100c0b2>] system_call_fastpath+0x16/0x1b
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5a0d2268d259886f0c87131639d19eb4a67b4532
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 23 10:42:02 2010 +0000
net: add netif_tx_queue_frozen_or_stopped
When testing struct netdev_queue state against FROZEN bit, we also test
XOFF bit. We can test both bits at once and save some cycles.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d3c15cab213becc49a6f2ad7f48a59513a5f17dd
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Nov 24 21:47:56 2010 +0000
ipv6: kill two unused macro definition
1. IPV6_TLV_TEL_DST_SIZE
This has not been using for several years since created.
2. RT6_INFO_LEN
commit 33120b30 kill all RT6_INFO_LEN's references, but only this definition remained.
commit 33120b30cc3b8665204d4fcde7288638b0dd04d5
Author: Alexey Dobriyan <adobriyan(a)sw.ru>
Date: Tue Nov 6 05:27:11 2007 -0800
[IPV6]: Convert /proc/net/ipv6_route to seq_file interface
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a40c9f88b5e3da500ddab9440e5ddac170c12281
Author: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
Date: Tue Nov 23 22:57:47 2010 +0000
net: add some KERN_CONT markers to continuation lines
Cc: netdev(a)vger.kernel.org
Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5a6f95e653adf52ee1ff09cd5e66c2640c65ff66
Author: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Date: Tue Nov 23 03:08:27 2010 +0000
netxen: avoid using reset_devices as it may become obsolete
In kdump environment do not depend on reset_devices
parameter to reset the device as the parameter may become obsolete.
Instead use an adapter specific mechanism to determine if the device
needs a reset.
Driver maintains a count of number of pci functions probed
and decrements the count when remove handler of that pci function
is called. If the first probe, probe of function 0,
detects the count as non zero then reset the device.
Signed-off-by: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b0044bcfa95ddf2e317863fb29121c284b6725ca
Author: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Date: Tue Nov 23 01:25:21 2010 +0000
qlcnic: avoid using reset_devices as it may become obsolete.
In kdump environment do not depend upon reset_devices parameter
to reset the pci function as this parameter may become obsolete.
Instead use an adapter specific mechanism to determine if the pci
function needs to be reset.
Per function refcount is maintained in driver, which is set in probe
and reset in remove handler of adapter. If the probe detects the count
as non zero then reset the function.
Signed-off-by: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5584b8078a60e34ec7d37c9b67a0f3d389a1a2f6
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Mon Nov 22 23:00:42 2010 +0000
sctp: kill unused macro definition
These macros have been existed for several years since v2.6.12-rc2.
But they never be used. So remove them now.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cf7afbfeb8ceb0187348d0a1a0db61305e25f05f
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Mon Nov 22 01:31:54 2010 +0000
rtnl: make link af-specific updates atomic
As David pointed out correctly, updates to af-specific attributes
are currently not atomic. If multiple changes are requested and
one of them fails, previous updates may have been applied already
leaving the link behind in a undefined state.
This patch splits the function parse_link_af() into two functions
validate_link_af() and set_link_at(). validate_link_af() is placed
to validate_linkmsg() check for errors as early as possible before
any changes to the link have been made. set_link_af() is called to
commit the changes later.
This method is not fail proof, while it is currently sufficient
to make set_link_af() inerrable and thus 100% atomic, the
validation function method will not be able to detect all error
scenarios in the future, there will likely always be errors
depending on states which are f.e. not protected by rtnl_mutex
and thus may change between validation and setting.
Also, instead of silently ignoring unknown address families and
config blocks for address families which did not register a set
function the errors EAFNOSUPPORT respectively EOPNOSUPPORT are
returned to avoid comitting 4 out of 5 update requests without
notifying the user.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 89bf67f1f080c947c92f8773482d9e57767ca292
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 22 00:15:06 2010 +0000
drivers/net: use vzalloc()
Use vzalloc() and vzalloc_node() in net drivers
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fe6d2a38b2076cba515dc95b5dc1589a7ab51c17
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Sun Nov 21 23:25:50 2010 +0000
be2net: adding support for Lancer family of CNAs
Key changes are:
- EQ ids are not assigned consecutively in Lancer. So, fix mapping of MSIx
vector to EQ-id.
- BAR mapping and some req locations different for Lancer.
- TCP,UDP,IP checksum fields must be compulsorily set in TX wrb for TSO in
Lancer.
- CEV_IST reg not present in Lancer; so, peek into event queue to check for
new entries
- cq_create and mcc_create cmd interface is different for Lancer; handle
accordingly
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar(a)emulex.com>
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9a67d761b39614c0495dcab9a204e21a9f4c4d31
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Thu Nov 18 10:40:03 2010 -0800
iwlagn: minor change in bt coex normal LUT
Minor changes in LUT
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 506aa156fa736e9f9ce476239c9549ebbf6b08ea
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 24 17:25:03 2010 -0800
iwlagn: use different kill mask when SCO active
use different kill_ack_mask and kill_cts_mask when detect SCO
is active.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 638514ff5d5845c6eba8c266ea04325be6e7d106
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:55 2010 -0800
iwlagn: Offical name for 100/130 device
Change to offical name for 100 devices:
"Intel(R) Centrino(R) Wireless-N 100"
Change to offical name for 130 devices:
"Intel(R) Centrino(R) Wireless-N 130"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit d2eceef02e717751d4f6a01eddea6f241d63c213
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:54 2010 -0800
iwlagn: Offical name for 6000g2b device
Change to offical name for 6000g2b devices:
"Intel(R) Centrino(R) Wireless-N 1030"
"Intel(R) Centrino(R) Advanced-N 6230"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 55017ab87831b3ca449b81b83b180baac2895666
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:53 2010 -0800
iwlagn: Offical name for 6000g2a device
Change to offical name for 6000g2a devices:
"Intel(R) Centrino(R) Advanced-N 6205"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit f9dc6467223319acaea64d95ff208409e4e48d07
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:52 2010 -0800
iwlagn: Offical name for 6050g2 device
Change to offical name for 6050g2 devices:
"Intel(R) Centrino(R) Wireless-N 6150"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 0c4ac342997c9597706a8fcbb0ccf920b3d33570
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 17 11:33:27 2010 -0800
iwlwifi: use mac80211 AC defines
Instead of hardcoding the numbers that must
match mac80211, use the constants. Not that
this means we could change the constants,
but at least this way it's clearer.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 6fb5511ab96d9f31be747bab842f96227a5c7aec
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:55:02 2010 -0800
iwlagn: advertise reliable TX status
Our hardware has reliable TX status, but we're
not currently advertising that to mac80211.
Since the packet loss monitoring will depend
on it, advertise it.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 2e34034e8c9755ff144379d410d5227926e91cce
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:51:38 2010 -0800
iwlagn: fix station powersave accounting for aggregation
Since aggregation queues are station-specific, the
device will not reject packets in them but rather
will stop the appropriate aggregation queues when
a station goes to sleep. I forgot to account for
this in the driver, so if a station went to sleep
that had aggregation enabled, traffic would stop
indefinitely.
Fix this by only accounting frames queued on the
normal AC queues for associated station.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 67158b67cea0c92dba1dda74cde926d149cc1a2e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:51:04 2010 -0800
iwlagn: remove powersave warning
Through races, a packet may be enqueued for
transmission to a station while that station
is going to sleep, in which case the warning
here triggers. Instead of warning, check the
condition -- if this packet is not a PS-poll
response then we still enqueue it but it will
be rejected by the device since the station
is marked as asleep.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 15 13:43:07 2010 -0800
iwlwifi: use antenna information in EEPROM
The valid tx/rx antenna information is part of EEPROM, so use it
to configure the device.
For few cases, the EEPROM did not reflect the correct antenna, but
it is too late to modify the EEPROM, so overwrite with .cfg parameters
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 4b7384f936817489a4172b9c5d946f63f479ca15
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 15 13:56:10 2010 -0800
iwlwifi: remove unused define
was not used, remove it
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 51cce8a590c4696d62bfacc63378d1036084cef7
Merge: 2fe66ec 4f85593
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Nov 24 16:49:20 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 4f8559383c41262b50dc758e2e310f257ce6a14d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Nov 20 03:08:48 2010 +0100
ath9k_hw: remove ath9k_hw_stoppcurecv
It is no longer used anywhere
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fa6e15e0b5952fd2cd99fc6d4f4473f6b9da18df
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:22 2010 +0530
ath9k_htc: Identify devices using driver_info
Categorize AR7010 & AR9287 devices based on driver_info
of usb_device_id, instead of PIDs. This avoids per-device cases
and minimize code changes for new device addition.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f7ec8fb4d6f8f3ecb8b11e9e46ece95aa66139cc
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:21 2010 +0530
ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB)
AR9287 devices (PCI/USB) use different eeprom start location
to read nvram. New devices might endup with same devid. So use
driver_info to set offset, instead of devid. driver_info is
valid for HTC devices alone which is filled in usb_device_id.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 64f121708342afec306ce52920cc9982f4f1008f
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:20 2010 +0530
ath9k_htc: Add driver_info in usb device list
Added driver_info to identify AR7010, R9287 HTC devices.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bedbbb959d2c1d1dbb4c2215f5b7074b1da3030a
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:19 2010 +0530
ath: Add a driver_info bitmask field
The driver_info stores the device category information which
is used to load appropriate device firmware, select firmware offset
and eeprom starting location. The driver_info is accessed across
ath9k_htc and ath9k_hw. Hence placed under common structure.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 35162ba75900209755628ccf7357763797037ba6
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:56 2010 -0800
iwlwifi: advance power management support
For 6000g2b and up, adding advance power management support
for better power consumption
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1f37daf3233ccda5072f715d6c322d84833cdd92
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:55 2010 -0800
iwlwifi: power management checking for shadow register
If shadow register is enable, modify the power management
command to inform uCode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:54 2010 -0800
iwlwifi: consider BT for power management
Check the BT PSPoll flag when fill PM command to uCode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 97badb0eefc9b6f23f864c5348b695be35f05882
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:53 2010 -0800
iwlwifi: add more power management flags
Adding additional power management option available for the device.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eeb1f83fa8f96501331cc17b73c57999e3a1ec5d
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:52 2010 -0800
iwlagn: name change for BT config flag
Bit 7 of BT config flag is used to enable/disable PSPoll sync.
Make the name to match it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 99ba2a14283be96a682e04455061c08a46bbf4ec
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 24 08:10:06 2010 +0100
mac80211: implement packet loss notification
For drivers that have accurate TX status reporting
we can report the number of consecutive lost packets
to userspace using the new cfg80211 CQM event. The
threshold is fixed right now, this may need to be
improved in the future.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c063dbf52b998b852122dff07a8b8dd430b38437
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 24 08:10:05 2010 +0100
cfg80211: allow using CQM event to notify packet loss
This adds the ability for drivers to use CQM events
to notify about packet loss for specific stations
(which could be the AP for the managed mode case).
Since the threshold might be determined by the
driver (it isn't passed in right now) it will be
passed out of the driver to userspace in the event.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 79b1c460a0b55e55981c25c56597c4d5d2872de3
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 24 14:34:41 2010 +0900
cfg80211: Add documentation for antenna ops
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 48124d1a91fb77defc9734b4556350d59671fb2c
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Nov 23 15:05:02 2010 -0800
mac80211: avoid aggregation for VO traffic
This should help with latency issues which can happen when
using aggregation.
Cc: Felix Fietkau <nbd(a)openwrt.org>
Cc: Matt Smith <matt.smith(a)atheros.com>
Cc: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c8b576061d87e2a4fb100e70c6a6dae189b3a310
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Nov 23 15:05:01 2010 -0800
ath9k: avoid aggregation for VO traffic
This should help with latency issues which can happen when
using aggregation.
Cc: Matt Smith <matt.smith(a)atheros.com>
Cc: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 72a8a3edd630995662bdc85957206685f376f9c4
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 23 03:10:32 2010 +0100
mac80211: reduce the number of retries for nullfunc probing
Since nullfunc frames are transmitted as unicast frames, they're more
reliable than the broadcast probe requests, so we need fewer retries
to figure out whether the AP is really gone.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4e5ff37692df35c8826f1291204841b174d3c3ce
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 23 03:10:31 2010 +0100
mac80211: use nullfunc instead of probe request for connection monitoring
nullfunc frames are better for connection monitoring, because probe requests
are answered even if the AP has already dropped the connection, whereas
nullfunc frames from an unassociated station will trigger a disassoc/deauth
frame from the AP (WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA), which allows
the station to reconnect immediately instead of waiting until it attempts to
transmit the next unicast frame.
This only works on hardware with reliable tx ACK reporting, any other hardware
needs to fall back to the probe request method.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dd5b4cc71cd09c33e1579cc6d5720656e94e52de
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 22 20:58:24 2010 +0100
cfg80211/mac80211: improve ad-hoc multicast rate handling
- store the multicast rate as an index instead of the rate value
(reduces cpu overhead in a hotpath)
- validate the rate values (must match a bitrate in at least one sband)
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 46090979a55a0dc2cdb3d939f94fa47742108194
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 23 20:28:03 2010 +0100
mac80211: probe the AP when resuming
Check the connection by probing the AP (either using nullfunc or a
probe request). If nullfunc probing is supported and the assoc is no
longer valid, the AP will send a disassoc/deauth immediately.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7ccc8bd7593634d827e8bc55898a5038e29848b5
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Nov 19 22:55:38 2010 +0100
mac80211: calculate beacon loss time accurately
Instead of using a fixed 2 second timeout, calculate beacon loss interval
from the advertised beacon interval and a frame count. With this beacon
loss happens after N (default 7) consecutive frames are missed which
for a typical setup (100TU beacon interval) is ~700ms (or ~1/3 previous).
Signed-off-by: Sam Leffler <sleffler(a)chromium.org>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c8a7972c3b3633bf90daf50b135665d8ca4838c4
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Nov 19 22:55:37 2010 +0100
mac80211: restart beacon miss timer on system resume from suspend
Signed-off-by: Paul Stewart <pstew(a)google.com>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0b81c23d2e3a8589514fa69b2f153f006a4ad773
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 21:11:43 2010 +0100
b43: N-PHY: little cleanups
Remove some typos, warnings, initialize some values to follow wl's code path.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a529cecd29ecf1e5416316ae06ce515bf67b5d5a
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 21:11:42 2010 +0100
b43: N-PHY: rev2: save and restore PHY regs on RSSI poll
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fee613b77df721781b9794945f0f1a8f535456ff
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 21:11:41 2010 +0100
b43: N-PHY: fix BPHY init
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bec186452b4cfecff9e2c579bfd4016119d39614
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:28:00 2010 +0100
b43: N-PHY: init BPHY when needed
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a5d3598de086cd38f71fe2fec43ac3ca97bb24bb
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:27:59 2010 +0100
b43: N-PHY: fix some typos, conditions, set gain_boost
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c0f05b9879a324937f14270e4a14d661d2beca63
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:27:58 2010 +0100
b43: N-PHY: minor fixes to match specs
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 69a3229edcf0c354e1cd93a811843fba7b6e1472
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:27:57 2010 +0100
b43: N-PHY: fix values for PHY regs in channel tables of 2055 radio
Additional comment by Larry Finger <Larry.Finger(a)lwfinger.net>:
This change deserves a bit more explanation. You might include something like
"These tables came from reverse engineering the 5.10.56.46 version of the
Broadcom driver. Trace comparisons between b43 and the current Broadcom driver
(5.10.120.0) show byte reversals for the PHY register writes."
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e9c0268f02f8970149158a9b7ea1e5c1c45c819d
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 16 19:56:49 2010 -0800
net/wireless: Use pr_<level> and netdev_<level>
No change in output for pr_<level> prefixes.
netdev_<level> output is different, arguably improved.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d7a066c92394f3e777351de0c903beeb8a08af76
Merge: ccb1435 e476a5a
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Nov 24 16:19:24 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit ccb14354017272ddac002e859a2711610b6af174
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Nov 24 16:18:36 2010 -0500
Revert "nl80211/mac80211: Report signal average"
This reverts commit 86107fd170bc379869250eb7e1bd393a3a70e8ae.
This patch inadvertantly changed the userland ABI.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1d24eb4815d1e0e8b451ecc546645f8ef1176d4f
Author: Tom Herbert <therbert(a)google.com>
Date: Sun Nov 21 13:17:27 2010 +0000
xps: Transmit Packet Steering
This patch implements transmit packet steering (XPS) for multiqueue
devices. XPS selects a transmit queue during packet transmission based
on configuration. This is done by mapping the CPU transmitting the
packet to a queue. This is the transmit side analogue to RPS-- where
RPS is selecting a CPU based on receive queue, XPS selects a queue
based on the CPU (previously there was an XPS patch from Eric
Dumazet, but that might more appropriately be called transmit completion
steering).
Each transmit queue can be associated with a number of CPUs which will
use the queue to send packets. This is configured as a CPU mask on a
per queue basis in:
/sys/class/net/eth<n>/queues/tx-<n>/xps_cpus
The mappings are stored per device in an inverted data structure that
maps CPUs to queues. In the netdevice structure this is an array of
num_possible_cpu structures where each structure holds and array of
queue_indexes for queues which that CPU can use.
The benefits of XPS are improved locality in the per queue data
structures. Also, transmit completions are more likely to be done
nearer to the sending thread, so this should promote locality back
to the socket on free (e.g. UDP). The benefits of XPS are dependent on
cache hierarchy, application load, and other factors. XPS would
nominally be configured so that a queue would only be shared by CPUs
which are sharing a cache, the degenerative configuration woud be that
each CPU has it's own queue.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR test
with 1 byte req. and resp.
bnx2x on 16 core AMD
XPS (16 queues, 1 TX queue per CPU) 1234K at 100% CPU
No XPS (16 queues) 996K at 100% CPU
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3853b5841c01a3f492fe137afaad9c209e5162c6
Author: Tom Herbert <therbert(a)google.com>
Date: Sun Nov 21 13:17:29 2010 +0000
xps: Improvements in TX queue selection
In dev_pick_tx, don't do work in calculating queue
index or setting
the index in the sock unless the device has more than one queue. This
allows the sock to be set only with a queue index of a multi-queue
device which is desirable if device are stacked like in a tunnel.
We also allow the mapping of a socket to queue to be changed. To
maintain in order packet transmission a flag (ooo_okay) has been
added to the sk_buff structure. If a transport layer sets this flag
on a packet, the transmit queue can be changed for the socket.
Presumably, the transport would set this if there was no possbility
of creating OOO packets (for instance, there are no packets in flight
for the socket). This patch includes the modification in TCP output
for setting this flag.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 22f4fbd9bd283ef85126e511171932a4af703776
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 24 11:41:56 2010 -0800
infiniband: remove dev_base_lock use
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)
Convert rdma_translate_ip() and update_ipv6_gids() to RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Roland Dreier <rolandd(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bba14de98753cb6599a2dae0e520714b2153522d
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 23 14:09:15 2010 +0000
scm: lower SCM_MAX_FD
Lower SCM_MAX_FD from 255 to 253 so that allocations for scm_fp_list are
halved. (commit f8d570a4 added two pointers in this structure)
scm_fp_dup() should not copy whole structure (and trigger kmemcheck
warnings), but only the used part. While we are at it, only allocate
needed size.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 456b61bca8ee324ab6c18b065e632c9a8c88aa39
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 23 13:12:15 2010 +0000
ipv6: mcast: RCU conversion
ipv6_sk_mc_lock rwlock becomes a spinlock.
readers (inet6_mc_check()) now takes rcu_read_lock() instead of read
lock. Writers dont need to disable BH anymore.
struct ipv6_mc_socklist objects are reclaimed after one RCU grace
period.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2757a15f08adbed9480c30bdb4e9a0bbf2b6f33a
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:38:17 2010 +0000
stmmac: update the driver version
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 874bd42d24c2a74f5dbd65e81e175982240fecd8
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:38:11 2010 +0000
stmmac: convert to dev_pm_ops.
This patch updates the PM support using the dev_pm_ops
and reviews the hibernation support.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 293bb1c41b728d4aa248fe8a0acd2b9066ff5c34
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:38:05 2010 +0000
stmmac: add init/exit callback in plat_stmmacenet_data struct
This patch adds in the plat_stmmacenet_data
the init and exit callbacks that can be used
for invoking specific platform functions.
For example, on ST targets, these call the
PAD manager functions to set PIO lines and
syscfg registers.
The patch removes the stmmac_claim_resource
only used on STM Kernels as well.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9dfeb4d953f914bd3bb56ce60e22ee84687399ce
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:37:58 2010 +0000
stmmac: tidy-up stmmac_priv structure
This patch tidies-up the stmmac_priv structure
that had many fileds alredy defined in the
plat_stmmacenet_data structure.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b340007f79941297c44a7dfba4d3c587ff81590f
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Nov 24 11:09:50 2010 -0800
bnx2x: Do interrupt mode initialization and NAPIs adding before register_netdev()
Move the interrupt mode configuration and NAPIs adding before a
register_netdev() call to prevent netdev->open() from running
before these functions are done.
Advance a driver version number.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Reported-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1210d127d11fc40d229648c9754aa60776ef796
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 24 03:45:10 2010 +0000
bnx2x: Disable local BHes to prevent a dead-lock situation
According to Eric's suggestion:
Disable local BHes to prevent a dead-lock situation between sch_direct_xmit()
(Soft_IRQ context) and bnx2x_tx_int (called by bnx2x_run_loopback() - syscall
context), as both are taking a netif_tx_lock().
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 37a118452cbc9c0cf0d23bfd16d3ca56058be754
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:54 2010 +0000
tg3: Remove tg3_config_info definition
This structure isn't used anywhere in the driver.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2e1e3291d4727e14c8f0f48df561afb1a5c26ffe
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:53 2010 +0000
tg3: Enable phy APD for 5717 and later asic revs
This patch enables the gphy autopowerdown feature in the phy for all
new devices that support it.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4bae65c892b4ff9a2797cbfa8526a5f9aaf1b2ed
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:52 2010 +0000
tg3: use dma_alloc_coherent() instead of pci_alloc_consistent()
Using dma_alloc_coherent() permits to use GFP_KERNEL allocations instead
of GFP_ATOMIC ones. Its better when a machine is out of memory, because
this allows driver to sleep to get its memory and succeed its init,
especially when allocating high order pages.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b92b9040f6e4997b895b7b9c655a158354d28964
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:51 2010 +0000
tg3: Reenable TSS for 5719
All TSS bugs have been fixed in the 5719. This patch reenables the
feature.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit deabaac8beeccdfee5358c0cd4c63258f28f3a74
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:50 2010 +0000
tg3: Enable mult rd DMA engine on 5719
The multiple DMA read engine bugs have been fixed on the 5719. This
patch reenables support for this feature.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 07ae8fc00bcc97d2f896b257da225a0789b0aa5d
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:49 2010 +0000
tg3: Reorg tg3_napi members
This patch reorders and realigns the tg3_napi members for a ~3-4%
performance improvement on small packet performance tests.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cf79003d598b1f82a4caa0564107283b4f560e14
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:48 2010 +0000
tg3: Fix 5719 internal FIFO overflow problem
Under load, there an internal FIFO can overflow on the 5719. The fix is
to scale back the PCIe maximum read request size based on the current
link speed and width.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d2394e6bb1aa636f3bd142cb6f7845a4332514b5
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:47 2010 +0000
tg3: Always turn on APE features in mac_mode reg
The APE needs certain bits in the mac_mode register to be enabled for
traffic to flow correctly. This patch changes the code to always enable
these bits in the presence of the APE.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b75cc0e4c1caac63941d96a73b2214e8007b934b
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:46 2010 +0000
tg3: Assign correct tx margin for 5719
Commit d309a46e42542223946d3a9e4e239fdc945cb53e, entitled
"tg3: 5719: Prevent tx data corruption", was supposed to contain the tx
margin adjustment but it looks like it somehow was omitted. This patch
fixes the problem.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5093eedc8bdfd7d906836a44a248f66a99e27d22
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:45 2010 +0000
tg3: Apply 10Mbps fix to all 57765 revisions
Commit a977dbe8445b8a81d6127c4aa9112a2c29a1a008, entitled
"tg3: Reduce 57765 core clock when link at 10Mbps" needs to be applied
to all revisions of the 57765 asic rev, not just the A0 revision.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2fe66ec242d3f76e3b0101f36419e7e5405bcff3
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 23 06:28:08 2010 +0000
SELinux: indicate fatal error in compat netfilter code
The SELinux ip postroute code indicates when policy rejected a packet and
passes the error back up the stack. The compat code does not. This patch
sends the same kind of error back up the stack in the compat code.
Based-on-patch-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Reviewed-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 04f6d70f6e64900a5d70a5fc199dd9d5fa787738
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 23 06:28:02 2010 +0000
SELinux: Only return netlink error when we know the return is fatal
Some of the SELinux netlink code returns a fatal error when the error might
actually be transient. This patch just silently drops packets on
potentially transient errors but continues to return a permanant error
indicator when the denial was because of policy.
Based-on-comments-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Reviewed-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f8afa42b01c7a9f45b7cbaadb0481a0eeb96f18d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 22 18:26:51 2010 +0100
ath9k_htc: fix eeprom access
wireless-testing commit a05b5d45049d60a06a1b12976150572304a51928
ath9k: add support for reading eeprom from platform data on PCI devices
This change moved the initialization of the AH_USE_EEPROM flag from ath9k_hw
to ath9k. This needs to be added to ath9k_htc as well
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 02d2ebb2a0aa2cae0446289c8f927067aec06079
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 22 15:39:39 2010 +0100
ath9k_hw: fix A-MPDU key search issues on AR9003
Under load, a large number of frames can produce decryption errors, even when
no key cache update is being done. Performing a key search for every single
frame in an A-MPDU improves reliability.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7253965a1cfbd22dd20f92b7a054e831777e284e
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:39:03 2010 -0800
zd1211rw: Use const
Mark arrays const that are unmodified after initializations.
text data bss dec hex filename
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.old
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f4e16e41d62ddc75704a0344567a807ebb41a929
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:39:01 2010 -0800
rt2x00: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
40197 56 8336 48589 bdcd drivers/net/wireless/rt2x00/rt2800lib.o.new
40205 56 8336 48597 bdd5 drivers/net/wireless/rt2x00/rt2800lib.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 22288a5847df30fb8ba298914f144c3b1d6e1fbe
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:39:00 2010 -0800
rndis_wlan: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
41757 2205 9896 53858 d262 drivers/net/wireless/rndis_wlan.o.old
41653 2205 9880 53738 d1ea drivers/net/wireless/rndis_wlan.o.new
Changed functions rndis_set_oid and set_bssid to take const *'s.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff273b91ff04e6f232234b70c45101074a0daa27
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:59 2010 -0800
ray_cs: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42607 3581 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.new
42603 3585 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 482e039f2a6546ee2ecf718ae6c02e84d1a7f00b
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:58 2010 -0800
libertas: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
3650 56 704 4410 113a drivers/net/wireless/libertas/rx.o.new
3695 56 704 4455 1167 drivers/net/wireless/libertas/rx.o.old
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.new
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 20407ed8a5bb271dd8e8bd4678e1d3dadeb318bd
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:57 2010 -0800
iwlwifi: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
48644 57 12120 60821 ed95 drivers/net/wireless/b43/phy_n.o.new
48661 57 12120 60838 eda6 drivers/net/wireless/b43/phy_n.o.old
37906 86 7904 45896 b348 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.new
37937 86 7904 45927 b367 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.old
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.new
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.old
Changed b43_nphy_write_clip_detection to take a const u16 *
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5b4bc649e18539a5d5a5482670d77f3f72de0eea
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:56 2010 -0800
b43: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
5502 56 1336 6894 1aee drivers/net/wireless/b43/phy_common.o.new
5511 56 1336 6903 1af7 drivers/net/wireless/b43/phy_common.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3370a895454ad814d0fb5f50352cea4e51d7392f
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:55 2010 -0800
atmel: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.old
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5653a63d85300dbed71b76ab7ada03808bdfb170
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:54 2010 -0800
carl9170: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.new
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 07b2fa5a2368accf0fe6cb16e7eca6d1150554ed
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:53 2010 -0800
ath9k: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11161 56 2136 13353 3429 drivers/net/wireless/ath/ath9k/ar9003_paprd.o.new
11167 56 2136 13359 342f drivers/net/wireless/ath/ath9k/ar9003_paprd.o.old
15428 56 3056 18540 486c drivers/net/wireless/ath/ath9k/eeprom_4k.o.old
15451 56 3056 18563 4883 drivers/net/wireless/ath/ath9k/eeprom_4k.o.new
14087 56 2560 16703 413f drivers/net/wireless/ath/ath9k/eeprom_9287.o.old
14036 56 2560 16652 410c drivers/net/wireless/ath/ath9k/eeprom_9287.o.new
10041 56 2384 12481 30c1 drivers/net/wireless/ath/ath9k/ani.o.new
10088 56 2384 12528 30f0 drivers/net/wireless/ath/ath9k/ani.o.old
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.new
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.old
16483 56 3432 19971 4e03 drivers/net/wireless/ath/ath9k/ar9003_phy.o.new
16517 56 3432 20005 4e25 drivers/net/wireless/ath/ath9k/ar9003_phy.o.old
18221 104 2960 21285 5325 drivers/net/wireless/ath/ath9k/rc.o.old
18203 104 2960 21267 5313 drivers/net/wireless/ath/ath9k/rc.o.new
19985 56 4288 24329 5f09 drivers/net/wireless/ath/ath9k/eeprom_def.o.new
20040 56 4288 24384 5f40 drivers/net/wireless/ath/ath9k/eeprom_def.o.old
23997 56 4984 29037 716d drivers/net/wireless/ath/ath9k/ar5008_phy.o.old
23846 56 4984 28886 70d6 drivers/net/wireless/ath/ath9k/ar5008_phy.o.new
24285 56 3184 27525 6b85 drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.old
24101 56 3184 27341 6acd drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.new
6834 56 1032 7922 1ef2 drivers/net/wireless/ath/ath9k/ar9002_phy.o.old
6780 56 1032 7868 1ebc drivers/net/wireless/ath/ath9k/ar9002_phy.o.new
36211 64 8624 44899 af63 drivers/net/wireless/ath/ath9k/hw.o.new
36401 64 8624 45089 b021 drivers/net/wireless/ath/ath9k/hw.o.old
9281 56 1496 10833 2a51 drivers/net/wireless/ath/ath9k/ar9003_calib.o.old
9150 56 1496 10702 29ce drivers/net/wireless/ath/ath9k/ar9003_calib.o.new
Use ARRAY_SIZE instead of a magic number.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8b22523b045858042c6700f556f840853de163ea
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:52 2010 -0800
ath5k: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11266 56 2464 13786 35da drivers/net/wireless/ath/ath5k/ani.o.old
11181 56 2464 13701 3585 drivers/net/wireless/ath/ath5k/ani.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 85be3d98dbc8d9cff9411c52c619c3752737b7b4
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:51 2010 -0800
ar9170: Use const
Mark an array const.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a9ab21133581580f6907abbc33fd3870e75dc935
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Sat Nov 20 16:53:26 2010 +0100
carl9170: fix init-self regression
The commit: "carl9170: tx path review" introduced a regression.
gcc (with -Winit-self):
tx.c:1264: warning: ‘super’ is used uninitialized in this function
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3b1d6dfaaf89694c2aa56fe9a6b0f0221b98a209
Author: Huang Weiyi <weiyi.huang(a)gmail.com>
Date: Sat Nov 20 20:06:02 2010 +0800
libertas: remove duplicated #include
Remove duplicated #include('s) in
drivers/net/wireless/libertas/cfg.c
Signed-off-by: Huang Weiyi <weiyi.huang(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e1566d1f322b41b1ac3acf33407a0cfe2a311b75
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Nov 20 03:08:46 2010 +0100
ath9k: fix recursive locking in the tx flush path
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Tested-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b5bb2f2beb4d54597fd54075480fc4874a9c08dc
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Thu Nov 18 12:08:10 2010 -0800
iwlwifi: fix modular 3945 only build
If only 3945 is selected, and is a module, build
fails because iwl-legacy.c won't be compiled. Fix
this by adding it to the build correctly.
This doesn't happen for 4965 because it is a bool
option, not tristate, since it's built into the
AGN module.
Reported-by: Randy Dunlap <randy.dunlap(a)oracle.com>
Tested-by: Randy Dunlap <randy.dunlap(a)oracle.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 18890d4b89d8507ad09289f6f57a71591c7e9e83
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Fri Nov 19 08:11:01 2010 +0100
mac80211: Disable hw crypto for GTKs on AP VLAN interfaces
When using AP VLAN interfaces, each VLAN interface should be in its own
broadcast domain. Hostapd achieves this by assigning different GTKs to
different AP VLAN interfaces.
However, mac80211 drivers are not aware of AP VLAN interfaces and as
such mac80211 sends the GTK to the driver in the context of the base AP
mode interface. This causes problems when multiple AP VLAN interfaces
are used since the driver will use the same key slot for the different
GTKs (there's no way for the driver to distinguish the different GTKs
from different AP VLAN interfaces). Thus, only the clients associated
to one AP VLAN interface (the one that was created last) can actually
use broadcast traffic.
Fix this by not programming any GTKs for AP VLAN interfaces into the hw
but fall back to using software crypto. The GTK for the underlying AP
interface is still sent to the driver.
That means, broadcast traffic to stations associated to an AP VLAN
interface is encrypted in software whereas broadcast traffic to
stations associated to the non-VLAN AP interface is encrypted in
hardware.
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2e253cf300c5e33f49b7dd8b593bfc722177401
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:09 2010 -0800
cfg80211: Fix regulatory bug with multiple cards and delays
When two cards are connected with the same regulatory domain
if CRDA had a delayed response then cfg80211's own set regulatory
domain would still be the world regulatory domain. There was a bug
on cfg80211's logic such that it assumed that once you pegged a
request as the last request it was already the currently set
regulatory domain. This would mean we would race setting a stale
regulatory domain to secondary cards which had the same regulatory
domain since the alpha2 would match.
We fix this by processing each regulatory request atomically,
and only move on to the next one once we get it fully processed.
In the case CRDA is not present we will simply world roam.
This issue is only present when you have a slow system and the
CRDA processing is delayed. Because of this it is not a known
regression.
Without this fix when a delay is present with CRDA the second card
would end up with an intersected regulatory domain and not allow it
to use the channels it really is designed for. When two cards with
two different regulatory domains were inserted you'd end up
rejecting the second card's regulatory domain request.
This fails with mac80211_hswim's regtest=2 (two requests, same alpha2)
and regtest=3 (two requests, different alpha2) module parameter
options.
This was reproduced and tested against mac80211_hwsim using this
CRDA delayer:
#!/bin/bash
echo $COUNTRY >> /tmp/log
sleep 2
/sbin/crda.orig
And these regulatory tests:
modprobe mac80211_hwsim regtest=2
modprobe mac80211_hwsim regtest=3
Reported-by: Mark Mentovai <mark(a)moxienet.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b0e2880b0518ad11af20c7c93ec5cac93f9f03b0
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:08 2010 -0800
cfg80211: move mutex locking to reg_process_pending_hints()
This will be required in the next patch and it makes the
next patch easier to review.
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f333a7a2f49e2a9b46f8d18962bd750b18beeecd
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:07 2010 -0800
cfg80211: move reg_work and reg_todo above
These will be used earlier in the next few patches.
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 31e99729ae66d8b74316547c40eed15172f14ea8
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:06 2010 -0800
cfg80211: put core regulatory request into queue
This will simplify the synchronization for pending requests.
Without this we have a race between the core and when we
restore regulatory settings, although this is unlikely
its best to just avoid that race altogether.
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8ce469999552b0c3325350cd9b4be417f2bbfc23
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 17 22:14:37 2010 +0100
b43: rfkill: use HI enabled bit for all devices
Devices which use LO enabled bit are covered by b43legacy
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8933f90c777c5728822206a2313c9c1361f5274f
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Oct 14 22:58:58 2010 +0200
b43: N-PHY: add 2056 radio channels tables
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff
Merge: b84a7d3 9e2e742
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Nov 22 15:28:30 2010 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
commit eb06acdc85585f28864261f28659157848762ee4
Author: Sridhar Samudrala <sri(a)us.ibm.com>
Date: Thu Oct 28 13:10:50 2010 +0000
macvlan: Introduce 'passthru' mode to takeover the underlying device
With the current default 'vepa' mode, a KVM guest using virtio with
macvtap backend has the following limitations.
- cannot change/add a mac address on the guest virtio-net
- cannot create a vlan device on the guest virtio-net
- cannot enable promiscuous mode on guest virtio-net
To address these limitations, this patch introduces a new mode called
'passthru' when creating a macvlan device which allows takeover of the
underlying device and passing it to a guest using virtio with macvtap
backend.
Only one macvlan device is allowed in passthru mode and it inherits
the mac address from the underlying device and sets it in promiscuous
mode to receive and forward all the packets.
Signed-off-by: Sridhar Samudrala <sri(a)us.ibm.com>
-------------------------------------------------------------------------
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e5700c740da2cb9f5a3aa978cd1fa3a79916ba04
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:28 2010 +0000
Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fdb26195f494988fc155c204aab0f0953ba7ec6f
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:27 2010 +0000
Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9ed05ad3c0629f434b18d20c51162f9bbb4f5d31
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:26 2010 +0000
Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 094f2faaa2c4973e50979158f655a1d31a97ba98
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:25 2010 +0000
Net: rds: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched.
Last but not least, took out if-conditionals.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 927a41f50c83b539fde5c01911f4968d717199bf
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:24 2010 +0000
Net: phonet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 64387df8da1e4f178a47d53930288a46a357a479
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:23 2010 +0000
Net: lapb: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 94ee288e94ab31cefe2c5af3b59c25a1374ca3e5
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:22 2010 +0000
Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cd30c62024904951392e21a200fe5427a6286736
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:21 2010 +0000
Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f91c4ae4989322ed5cd10b5247e1a7bd3868a84e
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:20 2010 +0000
Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4de58dfebe6882dc1e8e8dc5ec062e28e99623cd
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:19 2010 +0000
Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6b8ff8c517008d93a6da62b106072a12dea8cb7c
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:18 2010 +0000
Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cc0bdac399b1881626cd5512f292e396c9c96685
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:17 2010 +0000
Net: econet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 22674a24b44ac53f244ef6edadd02021a270df5a
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:16 2010 +0000
Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fa13bc3daa5954ce58f68fd34fb1611df6ea6e6f
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:15 2010 +0000
Net: ceph: Makefile: remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bac14e017830bd204b3a1bd55f42b0841c02e995
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:14 2010 +0000
Net: can: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a3106d032fb17283c96fa041f8285e6926ae074d
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:13 2010 +0000
Net: caif: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched.
Last but not least, took out if-conditionals.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 87217502d4f45a9925c5eda5b2179f1220e87537
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:12 2010 +0000
Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Mon Nov 22 12:59:08 2010 +0200
wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc
On the disassociation event from the mac80211, the wl12xx driver does not
clear the chipset configuration related to the AP - i.e. it does not perform
a DISCONNECT and then a JOIN with zero SSID and dummy BSSID. Also, it does not
unset the BSSID filter.
Often this is not a problem, as the above is performed upon entering idle
state. But if a scenario arises where a new association is attempted without
cycling through idle state, the new association will fail.
Fix this by resetting the firmware state on disassociation.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 68d069c45f73e8aeda0249891daec1f7e2f0e067
Author: Arik Nemtsov <arik(a)wizery.com>
Date: Mon Nov 8 10:51:07 2010 +0100
wl1271: add support for HW TX fragmentation
Indicate to mac80211 we support HW fragmentation.
Support updates of the fragmentation threshold via the
set_frag_threshold callback.
Signed-off-by: Arik Nemtsov <arik(a)wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit fa97f46b30357a50f3ee193e6f82864f95bc55ec
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Wed Nov 10 11:27:20 2010 +0100
Revert "wl1271: Change supported channel order for a more optimal scan"
This reverts commit fa21c7a9e4be439e217fe72edbd39b643b643791.
The reverted patch caused more harm than benefit.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit b7417d930afdc214daa24299912d984e7f4f390a
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Wed Nov 10 11:27:19 2010 +0100
wl1271: Prevent ad-hoc and active scanning on 11a DFS frequencies
The wl1271 does not support radar detection. Hence, prevent ad-hoc and
active scanning on frequencies requiring DFS.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 91433029e42e58d8536299f32fa55cf589adff35
Author: Gery Kahn <geryk(a)ti.com>
Date: Sun Nov 7 10:04:20 2010 +0100
wl1271: cleanup unused code of calibration structures
The cleanup unused code for calibration procedures.
Signed-off-by: Gery Kahn <geryk(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 00d201001bd4e8a46e3d03c970abcb72256c368b
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Mon Nov 8 11:20:10 2010 +0000
wl1271: Change wl12xx Files Names
All files name prefix removed due to the fact that wl12xx driver supports
wl1271 and wl1273.
Also the definition in Kconfig and header files changed respectively.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 551eaff1b384cc107eab6332ba8424b3ca1f304b
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Nov 21 10:26:44 2010 -0800
pktgen: allow faster module unload
Unloading pktgen module needs ~6 seconds on a 64 cpus machine, to stop
64 kthreads.
Add a pktgen_exiting variable to let kernel threads die faster, so that
kthread_stop() doesnt have to wait too long for them. This variable is
not tested in fast path.
Note : Before exiting from pktgen_thread_worker(), we must make sure
kthread_stop() is waiting for this thread to be stopped, like its done
in kernel/softirq.c
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f
Author: Jan Engelhardt <jengelh(a)medozas.de>
Date: Sat Nov 20 18:07:21 2010 +0000
netns: let net_generic take pointer-to-const args
This commit is same in nature as v2.6.37-rc1-755-g3654654; the network
namespace itself is not modified when calling net_generic, so the
parameter can be const.
Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bbce5a59e4e0e6e1dbc85492caaf310ff6611309
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sat Nov 20 07:31:54 2010 +0000
packet: use vzalloc()
alloc_one_pg_vec_page() is supposed to return zeroed memory, so use
vzalloc() instead of vmalloc()
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Neil Horman <nhorman(a)tuxdriver.com>
Acked-by: Neil Horman <nhorman(a)tuxdriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9a2d09cf61c9d9f1b31998bec5363a583e4564a4
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Sun Nov 21 09:55:10 2010 -0800
ixgbe: update version number for ixgbe
This will reflect addition of new X540 hardware
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 09c5088e5c5993be217a2c85dca088147ffc9b72
Author: Shreyas Bhatewara <sbhatewara(a)vmware.com>
Date: Fri Nov 19 10:55:24 2010 +0000
net-next: Add multiqueue support to vmxnet3 driver
Add multiqueue support to vmxnet3 driver
This change adds multiqueue and thus receive side scaling support
to vmxnet3 device driver. Number of rx queues is limited to 1 in cases
where MSI is not configured or one MSIx vector is not available per rx
queue
Signed-off-by: Shreyas Bhatewara <sbhatewara(a)vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh(a)vmware.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 24912420e923d56461b400d83f250a31bed8a964
Merge: 0670b8a 0302b86
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Nov 19 13:13:47 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
commit 0670b8ae66daf1d326c7bd10e73daff5f18fcf92
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:21:35 2010 +0000
X25: remove bkl in routing ioctls
Routing doesn't use the socket data and is protected by x25_route_list_lock
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 54aafbd4989a684ca876e49bf3e6eb931654dc02
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:21:28 2010 +0000
X25: remove bkl in inq and outq ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:21:20 2010 +0000
X25: remove bkl in timestamp ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 70be998c2b44f942f11383496622500136816acb
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:20:57 2010 +0000
X25: pushdown bkl in ioctls
Push down the bkl in the ioctls so they can be removed one at a time.
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c26aed40f4fd18f86bcc6aba557cab700b129b73
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 18 22:04:46 2010 +0000
filter: use reciprocal divide
At compile time, we can replace the DIV_K instruction (divide by a
constant value) by a reciprocal divide.
At exec time, the expensive divide is replaced by a multiply, a less
expensive operation on most processors.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8c1592d68bc89248bfd0ee287648f41c1370d826
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 18 21:56:38 2010 +0000
filter: cleanup codes[] init
Starting the translated instruction to 1 instead of 0 allows us to
remove one descrement at check time and makes codes[] array init
cleaner.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 93aaae2e01e57483256b7da05c9a7ebd65ad4686
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Nov 19 09:49:59 2010 -0800
filter: optimize sk_run_filter
Remove pc variable to avoid arithmetic to compute fentry at each filter
instruction. Jumps directly manipulate fentry pointer.
As the last instruction of filter[] is guaranteed to be a RETURN, and
all jumps are before the last instruction, we dont need to check filter
bounds (number of instructions in filter array) at each iteration, so we
remove it from sk_run_filter() params.
On x86_32 remove f_k var introduced in commit 57fe93b374a6b871
(filter: make sure filters dont read uninitialized memory)
Note : We could use a CONFIG_ARCH_HAS_{FEW|MANY}_REGISTERS in order to
avoid too many ifdefs in this code.
This helps compiler to use cpu registers to hold fentry and A
accumulator.
On x86_32, this saves 401 bytes, and more important, sk_run_filter()
runs much faster because less register pressure (One less conditional
branch per BPF instruction)
# size net/core/filter.o net/core/filter_pre.o
text data bss dec hex filename
2948 0 0 2948 b84 net/core/filter.o
3349 0 0 3349 d15 net/core/filter_pre.o
on x86_64 :
# size net/core/filter.o net/core/filter_pre.o
text data bss dec hex filename
5173 0 0 5173 1435 net/core/filter.o
5224 0 0 5224 1468 net/core/filter_pre.o
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0a80410dc53cf68e56456bef1ca66949b87412f9
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Wed Nov 17 14:06:25 2010 +0000
can: EG20T PCH: use BIT(X)
Replace bit assignment value to BIT(X).
For easy to readable/identifiable, replace all bit assigned macros to BIT(X)
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 086b5650dcdaae7c4aa60a5d0724f775e733610e
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Wed Nov 17 01:13:16 2010 +0000
can: EG20T PCH: add prefix to macro
For easy to readable/identifiable, add prefix "PCH_" to all of #define macros.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 30dfe2c05037fbc021121c037872c09956938c2f
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Nov 18 11:49:25 2010 -0800
atm: fore200e: Fix build warning.
GCC (rightfully) complains that:
drivers/atm/fore200e.c:614:5: warning: operation on 'cmdq->head' may be undefined
This is due to the FORE200E_NEXT_ENTRY macro, which essentially
evaluates to:
i = ++i % m
Make it what's explicitly intended here which is:
i = (i + 1) % m
and the warning goes away.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a76a574ca9ce7c05791cee42f000f2a42c687837
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 17 19:52:13 2010 +0100
ssb: drop BCM4328 hack for SPROM revision
This hacks leads to incorrect SPROM parsing for me and reading for example MAC
as: 00:00:00:54:00:00. Michael G. who introduced this confirmed it is not
needed anymore.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Tested-by: Michael Gerdau <mgd(a)qata.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aaa13ca2428789b3c8096b5edc175d4d78b5f504
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Nov 17 04:19:47 2010 +0100
ath9k_hw: support reading calibration data from flash on AR9003
Embedded boards do not have compressed EEPROM data, they use the
struct ar9003_eeprom layout, with little endian fields, so copying
the raw data to the eeprom buffer is enough.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a05b5d45049d60a06a1b12976150572304a51928
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Nov 17 04:25:33 2010 +0100
ath9k: add support for reading eeprom from platform data on PCI devices
Some embedded boards store platform data for connected PCIe AR92xx
chips in the system flash instead of a separate EEPROM chip.
Signed-off-by: Gabor Juhos <juhosg(a)openwrt.org>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 458fafdd579dcb58c8288c55c9cd92d6816ba094
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Nov 16 16:49:08 2010 -0500
rndis_wlan: avoid uninitialized var warning in rndis_wlan_craft_connected_bss
CC [M] drivers/net/wireless/rndis_wlan.o
drivers/net/wireless/rndis_wlan.c: In function ‘rndis_wlan_craft_connected_bss’:
drivers/net/wireless/rndis_wlan.c:2542:2: warning: ‘ret’ may be used uninitialized in this function
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
Acked-by: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
commit 8befba6f2262a6e31d6e3bcf7d07ff46da444ec0
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Nov 16 16:08:56 2010 -0500
iwmc3200wifi: clarify potentially undefined operation in iwm_scan_ssids
CC [M] drivers/net/wireless/iwmc3200wifi/commands.o
drivers/net/wireless/iwmc3200wifi/commands.c: In function ‘iwm_scan_ssids’:
drivers/net/wireless/iwmc3200wifi/commands.c:911:15: warning: operation on ‘iwm->scan_id’ may be undefined
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 86107fd170bc379869250eb7e1bd393a3a70e8ae
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Nov 16 10:58:48 2010 +0900
nl80211/mac80211: Report signal average
Extend nl80211 to report an exponential weighted moving average (EWMA) of the
signal value. Since the signal value usually fluctuates between different
packets, an average can be more useful than the value of the last packet.
This uses the recently added generic EWMA library function.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eef39befaae2a1559efe197d795c376a317af2af
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Nov 16 10:58:43 2010 +0900
ath5k: Use generic EWMA library
Remove ath5k's private moving average implementation in favour of the generic
library version.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c5485a7e7569ab32eea240c850198519e2a765ef
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Nov 16 10:58:37 2010 +0900
lib: Add generic exponentially weighted moving average (EWMA) function
This adds generic functions for calculating Exponentially Weighted Moving
Averages (EWMA). This implementation makes use of a structure which keeps the
EWMA parameters and a scaled up internal representation to reduce rounding
errors.
The original idea for this implementation came from the rt2x00 driver
(rt2x00link.c). I would like to use it in several places in the mac80211 and
ath5k code and I hope it can be useful in many other places in the kernel code.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 20:36:42 2010 +0000
igmp: refine skb allocations
IGMP allocates MTU sized skbs. This may fail for large MTU (order-2
allocations), so add a fallback to try lower sizes.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4c3710afbc333c33100739dec10662b4ee64e219
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Nov 16 20:28:24 2010 +0000
net: move definitions of BPF_S_* to net/core/filter.c
BPF_S_* are used internally, should not be exposed to the others.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Hagen Paul Pfeifer <hagen(a)jauu.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cba328fc5ede9091616e7296483840869b615a46
Author: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
Date: Tue Nov 16 15:19:51 2010 +0000
filter: Optimize instruction revalidation code.
Since repeating u16 value to u8 value conversion using switch() clause's
case statement is wasteful, this patch introduces u16 to u8 mapping table
and removes most of case statements. As a result, the size of net/core/filter.o
is reduced by about 29% on x86.
Signed-off-by: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9e50e3ac5a5bbb1fd2949bdd57444ad1b93e5f41
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:12:28 2010 +0000
net: add priority field to pktgen
Add option to set skb priority to pktgen. Useful for testing
QOS features. Also by running pktgen on the vlan device the
qdisc on the real device can be tested.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f72f2f4cdeb67bc262d80a6d474292f00182a4dc
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Thu Nov 18 09:37:07 2010 -0800
dccp ccid-2: whitespace fix-up
This fixes whitespace noise introduced in commit "dccp ccid-2: Algorithm to
update buffer state", 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a, 14 Nov 2010.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 866f3b25a2eb60d7529c227a0ecd80c3aba443fd
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 18 09:33:19 2010 -0800
bonding: IGMP handling cleanup
Instead of iterating in_dev->mc_list from bonding driver, its better
to call a helper function provided by igmp.c
Details of implementation (locking) are private to igmp code.
ip_mc_rejoin_group(struct ip_mc_list *im) becomes
ip_mc_rejoin_groups(struct in_device *in_dev);
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 50a9432daeece6fc1309bef1dc0a7b8fde8204cb
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:50:28 2010 -0800
mac80211: fix powersaving clients races
The code to handle powersaving stations has a race:
when the powersave flag is lifted from a station,
we could transmit a packet that is being processed
for TX at the same time right away, even if there
are other frames queued for it. This would cause
frame reordering. To fix this, lift the flag only
under the appropriate lock that blocks TX.
Additionally, the code to allow drivers to block a
station while frames for it are on the HW queue is
never re-enabled the station, so traffic would get
stuck indefinitely. Fix this by clearing the flag
for this appropriately.
Finally, as an optimisation, don't do anything if
the driver unblocks an already unblocked station.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4bce22b9b84032c77c7e038b07b24fcc706dfc10
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:49:58 2010 -0800
mac80211: defines for AC numbers
In many places we've just hardcoded the
AC numbers -- which is a relic from the
original mac80211 (d80211). Add constants
for them so we know what we're talking
about.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 16 19:20:28 2010 +0100
ath9k_hw: add support for reading EEPROM data from the internal OTP ROM
Some of the new AR9003 cards do not come with an external EEPROM chip
anymore. Calibration data on these cards is stored in the OTP ROM on
the chip.
This patch adds support for reading this data, and also adds support
for different EEPROM chip sizes (512 bytes instead of 1K).
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d42efc44e38d3a8b2bf30e34559036bb6541672
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:13 2010 +0100
ath9k: store frame information used by aggregation inside the skb tx info
Since the pointers after the rates in the tx info cannot be used anymore
after frames have been queued, this area can be used to store information
that was previously stored in the ath_buf. With these changes, we can delay
the ath_buf assignment in the aggregation code until aggregates are formed.
That will not only make it possible to simplify DMA descriptor setup to
do less rewriting of uncached memory, but will also make it easier to
move aggregation out of the core of the ath9k tx path.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:12 2010 +0100
ath9k: more tx setup cleanups
- remove the BUF_HT flag, and instead check for IEEE80211_TX_CTL_AMPDU
before calling ath_tx_send_ampdu.
- remove a few unused variables
- calculate frame length before adding the frame padding
- merge the misnamed ath_tx_start_dma function into ath_tx_start
- remove an unused argument for assign_aggr_tid_seqno
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 71a3bf3e94b745467fc4c3451a294910f0369555
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:11 2010 +0100
ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set
This makes further tx path cleanups easier
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 28d167086227969fd6586953ee4ac682a3c394ff
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:10 2010 +0100
ath9k: clean up code duplication around ath_tx_start
Merge initial processing for the CAB queue and regular tx.
Also move ath_tx_cabq() to beacon.c and make it static.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c5992618259598ade82c386aa1595bf105e92d1f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:09 2010 +0100
ath9k: remove bf_tx_aborted from struct ath_buf
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 76e4522177de81ac89ade01a394aeb3704a66f1b
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:08 2010 +0100
ath9k: remove bfs_frmlen from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b572d0335fcb26e526f6ae087a9a09371b22e739
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:07 2010 +0100
ath9k: remove bfs_nframes from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 269c44bc8415ad78fb4dc3de25e6de3420332e9f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:06 2010 +0100
ath9k: remove bfs_al from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3017047f564d5101009c8318b94bdacd3ca3312e
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:05 2010 +0100
ath9k: remove bfs_keyix from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 82259b77f6e55c5b81f5f4a2852f6216c196ef30
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:04 2010 +0100
ath9k: remove bfs_paprd_timestamp from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 952cd693718d8ac796d5323fe7876241cf15ecfa
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:03 2010 +0100
ath9k: remove bfs_keytype from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5daefbd061d9509644058b6886abe2b6672ee386
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:02 2010 +0100
ath9k: remove bfs_tidno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d3bcba0827013dfc60f727e7370dea00bc0638a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:01 2010 +0100
ath9k: remove bfs_seqno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9a6b82706317333a1fab5dcafa2c33b91253a7a2
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 00:03:01 2010 +0100
ath9k: fix PA predistortion training frame setup
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c5d0855acfa4d6801c4c45bc02ddddd959262050
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Nov 13 20:22:41 2010 +0100
ath9k_hw: set default values for radar pulse detection
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 387e68846413f3dcfc5a5afca9841430057e3340
Author: RA-Jay Hung <Jay_Hung(a)ralinktech.com>
Date: Sat Nov 13 19:13:53 2010 +0100
rt2x00: Modify rt2x00queue_remove_l2pad to make skb->data two-byte alignment
When send out skb data to mac80211, orignal code will cause mac80211
unaligned access, so modify code to make mac80211 can natural access.
Signed-off-by: RA-Jay Hung <jay_hung(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a
Author: RA-Jay Hung <Jay_Hung(a)ralinktech.com>
Date: Sat Nov 13 19:12:54 2010 +0100
rt2x00: Fix header_length in rt2x00lib_txdone
Put the assignment of header_length after pull out extra tx headroom
Signed-off-by: RA-Jay Hung <jay_hung(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b43d63bd69ae5464a52bf1796e84097607917b2f
Author: RA-Jay Hung <Jay_Hung(a)ralinktech.com>
Date: Sat Nov 13 19:11:46 2010 +0100
rt2x00: Fix rt2800 USB TX Path DMA issue
rt2800usb chips need to add 1~3 bytes zero padding after each 802.11 header & payload,
and at the end need to add 4 bytes zero padding whether doing TX bulk aggregation or not,
TXINFO_W0_USB_DMA_TX_PKT_LEN in TXINFO must include 1-3 bytes padding after 802.11 header & payload
but do not include 4 bytes end zero padding.
In rt2800usb_get_tx_data_len do not consider multiple of the USB packet size case, sometimes this will
cause USB DMA problem.
Signed-off-by: RA-Jay Hung <jay_hung(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ef8397cfb3a385bc57a32213d0e4a5b7903a9dc6
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:11:22 2010 +0100
rt2x00: Use ioremap for SoC devices instead of KSEG1ADDR.
Make the code a bit more portable to architectures that do not support
KSEG1ADDR.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Tested-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 72c7296e03e381b49958809915105b18b09fa7a3
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:10:54 2010 +0100
rt2x00: Remove unneccessary internal Kconfig symbols.
CONFIG_RT2800PCI_PCI and CONFIG_RT2800PCI_SOC are strictly not needed
as we can check the dependent symbols directly in the rest of Kconfig
and the code, so clean up the Kconfig namespace a bit.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a6a8d66ebaea1e78d779af221bd6f01c5cbe71f5
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:10:31 2010 +0100
rt2x00: Remove RT30XX Kconfig variables.
Enabling of RT30xx devices via Kconfig variables was introduced when these
devices weren't properly supported yet.
Now that that they are properly supported and functional, we can remove these
Kconfig variables for RT30xx devices and simply enable them whenever rt2800pci
and/or rt2800usb is enabled.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 46af584d2ea86518c4cdf521903cd93ba6de2ec0
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:10:10 2010 +0100
rt2x00: Clean up Kconfig for RT2800 devices.
General clean up of the Kconfig part for RT28XX devices.
Also remove the indications of non functional support for rt27xx/rt28xx/rt30xx
devices, as this is no longer true. They just work fine.
Finally, remove the experimental indications for rt27xx/rt28xx/rt30xx devices
as that is no longer true. Keep the experimental indications for rt33xx/rt35xx
devices, though.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f93bc9b3ce379800b30b3c2f4fc945ae35a80039
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:09:50 2010 +0100
rt2x00: Add initial support for RT3370/RT3390 devices.
Modified from Eddy's patch by adding the RT3370 USB support as well.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Cc: Eddy Tsai <Eddy_Tsai(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae4ecb9f8f01eb9deffb5bd837dc90f4e646cd2d
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Sat Nov 13 19:08:14 2010 +0100
rt2x00: Increase REGISTER_BUSY_COUNT
For some hardware the REGISTER_BUSY_COUNT isn't sufficient,
increase the REGISTER_BUSY_COUNT to 100 to catch most
devices which have more problems with accessing the registers.
For normal operating devices nothing would change as they will
exit the loop early anyway.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dda0b38692a7298f433b92b1329867b1ecabb4bb
Author: Vasiliy Kulikov <segoon(a)openwall.com>
Date: Sun Nov 14 07:06:08 2010 +0000
net: ipv4: tcp_probe: cleanup snprintf() use
snprintf() returns number of bytes that were copied if there is no overflow.
This code uses return value as number of copied bytes. Theoretically format
string '%lu.%09lu %pI4:%u %pI4:%u %d %#x %#x %u %u %u %u\n' may be expanded
up to 163 bytes. In reality tv.tv_sec is just few bytes instead of 20, 2 ports
are just 5 bytes each instead of 10, length is 5 bytes instead of 10. The rest
is an unstrusted input. Theoretically if tv_sec is big then copy_to_user() would
overflow tbuf.
tbuf was increased to fit in 163 bytes. snprintf() is used to follow return
value semantic.
Signed-off-by: Vasiliy Kulikov <segoon(a)openwall.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9ea19481db31d614f729f346bdcf28e4e60ff14a
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 06:31:39 2010 +0000
net: zero kobject in rx_queue_release
netif_set_real_num_rx_queues() can decrement and increment
the number of rx queues. For example ixgbe does this as
features and offloads are toggled. Presumably this could
also happen across down/up on most devices if the available
resources changed (cpu offlined).
The kobject needs to be zero'd in this case so that the
state is not preserved across kobject_put()/kobject_init_and_add().
This resolves the following error report.
ixgbe 0000:03:00.0: eth2: NIC Link is Up 10 Gbps, Flow Control: RX/TX
kobject (ffff880324b83210): tried to init an initialized object, something is seriously wrong.
Pid: 1972, comm: lldpad Not tainted 2.6.37-rc18021qaz+ #169
Call Trace:
[<ffffffff8121c940>] kobject_init+0x3a/0x83
[<ffffffff8121cf77>] kobject_init_and_add+0x23/0x57
[<ffffffff8107b800>] ? mark_lock+0x21/0x267
[<ffffffff813c6d11>] net_rx_queue_update_kobjects+0x63/0xc6
[<ffffffff813b5e0e>] netif_set_real_num_rx_queues+0x5f/0x78
[<ffffffffa0261d49>] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe]
[<ffffffffa0262509>] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe]
[<ffffffffa0274596>] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe]
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5811662b15db018c740c57d037523683fd3e6123
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Nov 12 18:43:55 2010 +0000
net: use the macros defined for the members of flowi
Use the macros defined for the members of flowi to clean the code up.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dd68ad2235b4625e0dc928b2b4c614d265f976d3
Author: Philippe De Muyter <phdm(a)macqel.be>
Date: Sat Nov 13 08:43:29 2010 +0000
net: more Kconfig whitespace cleanup
indentation for TSI108_ETH entry was too big.
Signed-off-by: Philippe De Muyter <phdm(a)macqel.be>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b1323c8fa153f63e20d5a7fc0be72073c3beb05b
Author: Joe Perches <joe(a)perches.com>
Date: Fri Nov 12 11:37:59 2010 +0000
drivers/net/can/sja1000: Use printf extension %pR for struct resource
Using %pR standardizes the struct resource output.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d8ee707114bc3615fd7be90eb942eba2dbe668ed
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 10:13:58 2010 +0000
drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a31ff3880578c37fd5c71ee863c23897dacfa9f8
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 10:13:57 2010 +0000
drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 802aa9c058f2046f0a5683f04d7755c362734010
Author: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Date: Tue Nov 16 14:09:06 2010 +0000
qlcnic: Bumped up driver version to 5.0.12
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 706f23ada68746ed475488e7d2e2ca392fc4f731
Author: Sony Chacko <sony.chacko(a)qlogic.com>
Date: Tue Nov 16 14:08:46 2010 +0000
qlcnic: lro off message log from set rx checsum
Log LRO off message while disabling rx checksum only when
LRO is already enabled.
Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2679a135e6452359cd807754617db0d05ad404e5
Author: Sritej Velaga <sritej.velaga(a)qlogic.com>
Date: Tue Nov 16 14:08:23 2010 +0000
qlcnic: Add description for CN1000Q adapter
Add description for CN1000Q adapter
Signed-off-by: Sritej Velaga <sritej.velaga(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c21fd48c22bd1a9c4a5286963086f246c782e47e
Author: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Date: Tue Nov 16 14:08:06 2010 +0000
qlcnic: Fix for kdump
In case of kdump environment the function may be in unknown state.
Reset the function using PCI FLR before initializing it.
Signed-off-by: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2abea2f0a5ab161facd865356d2e59b23204414e
Author: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Date: Tue Nov 16 14:07:53 2010 +0000
qlcnic: Allow minimum bandwidth of zero
Allow minimum bandwidth to be set zero
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b382b191ea9e9ccefc437433d23befe91f4a8925
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:33:57 2010 +0000
ipv6: AF_INET6 link address family
IPv6 already exposes some address family data via netlink in the
IFLA_PROTINFO attribute if RTM_GETLINK request is sent with the
address family set to AF_INET6. We take over this format and
reuse all the code.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Cc: YOSHIFUJI Hideaki <yoshfuji(a)linux-ipv6.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9f0f7272ac9506f4c8c05cc597b7e376b0b9f3e4
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:32:48 2010 +0000
ipv4: AF_INET link address family
Implements the AF_INET link address family exposing the per
device configuration settings via netlink using the attribute
IFLA_INET_CONF.
The format of IFLA_INET_CONF differs depending on the direction
the attribute is sent. The attribute sent by the kernel consists
of a u32 array, basically a 1:1 copy of in_device->cnf.data[].
The attribute expected by the kernel must consist of a sequence
of nested u32 attributes, each representing a change request,
e.g.
[IFLA_INET_CONF] = {
[IPV4_DEVCONF_FORWARDING] = 1,
[IPV4_DEVCONF_NOXFRM] = 0,
}
libnl userspace API documentation and example available from:
http://www.infradead.org/~tgr/libnl/doc-git/group__link__inet.html
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca7479ebbd9f7621646bf2792cb7143647f035bb
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:31:20 2010 +0000
inet: Define IPV4_DEVCONF_MAX
Define IPV4_DEVCONF_MAX to get rid of MAX - 1 notation.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f8ff182c716c6f11ca3061961f5722f26a14e101
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:30:14 2010 +0000
rtnetlink: Link address family API
Each net_device contains address family specific data such as
per device settings and statistics. We already expose this data
via procfs/sysfs and partially netlink.
The netlink method requires the requester to send one RTM_GETLINK
request for each address family it wishes to receive data of
and then merge this data itself.
This patch implements a new API which combines all address family
specific link data in a new netlink attribute IFLA_AF_SPEC.
IFLA_AF_SPEC contains a sequence of nested attributes, one for each
address family which in turn defines the structure of its own
attribute. Example:
[IFLA_AF_SPEC] = {
[AF_INET] = {
[IFLA_INET_CONF] = ...,
},
[AF_INET6] = {
[IFLA_INET6_FLAGS] = ...,
[IFLA_INET6_CONF] = ...,
}
}
The API also allows for address families to implement a function
which parses the IFLA_AF_SPEC attribute sent by userspace to
implement address family specific link options.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d67ef35fff67845c64d806c033cc7c569ccebfff
Author: Jeremy Eder <jeder(a)redhat.com>
Date: Mon Nov 15 05:41:31 2010 +0000
clarify documentation for net.ipv4.igmp_max_memberships
This patch helps clarify documentation for
net.ipv4.igmp_max_memberships by providing a formula for
calculating the maximum number of multicast groups that can be
subscribed to, plus defining the theoretical limit.
Signed-off-by: Jiri Pirko <jpirko(a)redhat.com>
Signed-off-by: Jeremy Eder <jeder(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9920239c90d5f6dadfb44325abf3568a5e3fd827
Author: Joe Perches <joe(a)perches.com>
Date: Wed Nov 10 18:54:58 2010 +0000
drivers/isdn/hisax: Add printf format/argument verification and fix fallout
Add __attribute__((format... to several functins
Make formats and arguments match.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1f1aaf82825865a50cef0b4722607abb12aeee52
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 16 11:52:57 2010 +0000
SELinux: return -ECONNREFUSED from ip_postroute to signal fatal error
The SELinux netfilter hooks just return NF_DROP if they drop a packet. We
want to signal that a drop in this hook is a permanant fatal error and is not
transient. If we do this the error will be passed back up the stack in some
places and applications will get a faster interaction that something went
wrong.
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ee58681195bf243bafc44ca53f3c24429d096cce
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 16 11:52:49 2010 +0000
network: tcp_connect should return certain errors up the stack
The current tcp_connect code completely ignores errors from sending an skb.
This makes sense in many situations (like -ENOBUFFS) but I want to be able to
immediately fail connections if they are denied by the SELinux netfilter hook.
Netfilter does not normally return ECONNREFUSED when it drops a packet so we
respect that error code as a final and fatal error that can not be recovered.
Based-on-patch-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit da6836500414ae734cd9873c2d553db594f831e9
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 16 11:52:38 2010 +0000
netfilter: allow hooks to pass error code back up the stack
SELinux would like to pass certain fatal errors back up the stack. This patch
implements the generic netfilter support for this functionality.
Based-on-patch-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 37d668004289d202f71dc5bfdadf6c18b34577a2
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:33 2010 +0000
net/atm: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ece49153b601d95bcebd45a6394e370972f0b0a0
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:31 2010 +0000
drivers/net: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5f54cebb13cdb8dcd85036f8bee29f14db18b6e1
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:30 2010 +0000
drivers/net/vxge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8739cfef1ab8bc02e1bf38c02399afe62f3a7800
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:29 2010 +0000
drivers/net/usb: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b16fed0af8416ee0fe9af6c1977f7b05e7e7c9b2
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:28 2010 +0000
drivers/net/qlge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4dd151876b6b81040121708ebc23c6cd1a3d5be8
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:27 2010 +0000
drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a887e220760c12e00b0591d67987e26f6e270d71
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:26 2010 +0000
drivers/net/pcmcia: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c04914af6861d62df303aeedbbe554972ce4e736
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:25 2010 +0000
drivers/net/bonding: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a17531fa4c951f32ca4f90b04ca42cfb11924098
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:24 2010 +0000
drivers/isdn/i4l: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a1082bfe7d2d88d9626f5542dda9c0781394e91f
Merge: 9d1e5e4 147b2c8
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Nov 17 09:56:04 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
commit 147b2c8cb4f3e16aafc87096365a913d01ee3a21
Author: Dongdong Deng <dongdong.deng(a)windriver.com>
Date: Tue Nov 16 19:50:15 2010 -0800
e1000e: add netpoll support for MSI/MSI-X IRQ modes
With enabling CONFIG_PCI_MSI, e1000e could work in MSI/MSI-X IRQ mode,
and netpoll controller didn't deal with those IRQ modes on e1000e.
This patch add the handling MSI/MSI-X IRQ modes to netpoll controller,
so that netconsole could work with those IRQ modes.
Signed-off-by: Dongdong Deng <dongdong.deng(a)windriver.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 1b98c2bb63a4b415d8d894d001b6d0256409e0d9
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Tue Nov 16 19:50:14 2010 -0800
e1000e: 82574 intermittently fails to initialize with manageability f/w
The driver can fail initializing the hardware when manageability firmware
is performing concurrent MDIO operations because the hardware semaphore
scheme to prevent concurrent operations between software and firmware is
incorrect for 82574/82583. Instead of using the SWSM register, the driver
should be using the EXTCNF_CTRL register. A software mutex is also added
to prevent simultaneous software threads from performing similar concurrent
accesses.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d478eb44f7a6b53256ae399fa7e597525b4034ee
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Tue Nov 16 19:50:13 2010 -0800
e1000e: 82571 SerDes link handle null code word from partner
SerDes Link detection on certain 82571 mezzanine cards can fail when the
link is forced, the link partner does not recognize forced link and the
link partner sends null code words. Detect the null code words and return
to auto-negotiation state which causes the link partner to begin responding
with valid code words. Within a reasonable interval the link will finally
settle as forced by both partners.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b1d670f10e8078485884f0cf7e384d890909aeaa
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:41:36 2010 -0800
Remove extra struct page member from the buffer info structure
declaration.
Reported-by: Andi Kleen <andi(a)firstfloor.org>
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit eca2a33c985eb19dd0ca4b37d66c7fb5d8b76308
Author: Julian Stecklina <jsteckli(a)os.inf.tu-dresden.de>
Date: Tue Nov 16 19:41:36 2010 -0800
igbvf: Remove some dead code in igbvf
Removed unused variable in igbvf.
Signed-off-by: Julian Stecklina <jsteckli(a)os.inf.tu-dresden.de>
Acked-by: Greg Rose <greg.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 2c20ebbaed7f3f21506629ee931941a9bba199ab
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:41:35 2010 -0800
igbvf: Update version and Copyright
Update version string and copyright notice
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:27:19 2010 -0800
ixgbevf: Fix Oops
The driver is calling netif_carrier_off and netif_tx_stop_all_queues
before the netdevice is registered which causes an Oops. Move call
to netif_carrier_off after the netdevice is registered and remove
call to netif_tx_stop_all_queues because there aren't any TX
queues yet.
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e2ddeba95c09d0d44719ff005e915dc06ff46571
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 19:27:18 2010 -0800
ixgbe: refactor ixgbe_alloc_queues()
I noticed ring variable was initialized before allocations, and that
memory node management was a bit ugly. We also leak memory in case of
ring allocations error.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b93a22260f6f4bcf6c92c54de8530a97d3e921f0
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Tue Nov 16 19:27:17 2010 -0800
ixgbe: add support for x540 MAC
This patch adds support for the x540 MAC which is the next MAC in the
82598/82599 line.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit fe15e8e1c78521e0b4e375d6ed415b82265419c9
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Tue Nov 16 19:27:16 2010 -0800
ixgbe: add MAC and PHY support for x540
Adds the new x540.c file and Aquantia 1202 PHY for X540 support.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a391f1d51244b8274920a33c5d11aeebec3aa68f
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Tue Nov 16 19:27:15 2010 -0800
ixgbe: make silicon specific functions generic
The new MAC type X540 shares much of the same functionality of
some silicon specific functions. To reduce duplicate code,
made these functions generic.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9b55bb038468a7b504ccdc1d956952598ae1b85b
Author: Yi Zou <yi.zou(a)intel.com>
Date: Tue Nov 16 19:27:14 2010 -0800
ixgbe: make sure FCoE DDP user buffers are really released by the HW
When invalidating the DDP context is invalidated, the HW may not be done
with the user buffer right away. In which case, we poll the FCBUFF register
to check if the buffer valid bit is cleared or not, if not, we wait for max
100us that is guaranteed by the HW.
Signed-off-by: Yi Zou <yi.zou(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 8ca371e484e2e5ceb9b90fdb83d8d251017d852b
Author: Yi Zou <yi.zou(a)intel.com>
Date: Tue Nov 16 19:27:13 2010 -0800
ixgbe: invalidate FCoE DDP context when no error status is available
The hw automatically invalidates the context if DDP is successful or there is
error detected. In case there is no error status available from the hw,
initializing the per context error status to be 1 allows the DDP context to be
still invalidated via the upper layer call to ddp_put().
Signed-off-by: Yi Zou <yi.zou(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a41c059741570779c0254a3a1aa4da3baa463d7c
Author: Yi Zou <yi.zou(a)intel.com>
Date: Tue Nov 16 19:27:13 2010 -0800
ixgbe: avoid doing FCoE DDP when adapter is DOWN or RESETTING
There is no point to allow incoming DDP requests from the upper layer stack if
the adapter is going down or being reset.
Signed-off-by: Yi Zou <yi.zou(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c84d324c770dc81acebc1042163da33c8ded2364
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:27:12 2010 -0800
ixgbe: rework Tx hang detection to fix reoccurring false Tx hangs
The Tx hang logic has been known to detect false hangs when
the device is receiving pause frames or has delayed processing
for some other reason.
This patch makes the logic more robust and resolves these
known issues. The old logic checked to see if the device
was paused by querying the HW then the hang logic was
aborted if the device was currently paused. This check was
racy because the device could have been in the pause state
any time up to this check. The other operation of the
hang logic is to verify the Tx ring is still advancing
the old logic checked the EOP timestamp. This is not
sufficient to determine the ring is not advancing but
only infers that it may be moving slowly.
Here we add logic to track the number of completed Tx
descriptors and use the adapter stats to check if any
pause frames have been received since the previous Tx
hang check. This way we avoid racing with the HW
register and do not detect false hangs if the ring is
advancing slowly.
This patch is primarily the work of Jesse Brandeburg. I
clean it up some and fixed the PFC checking.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e3de4b7bdfd2c06884c95cfb4ad4d64be046595e
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:11 2010 -0800
ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed fiber
This change resolves some null function pointer accesses on 82598 when a
multi-speed fiber module is inserted into the adapter.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 2274543f15133165b855b9a4a1503b2c1268c6cf
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:10 2010 -0800
ixgbe: populate the ring->q_vector pointer during ring mapping
The q_vector back pointer was not being set in the rings so it would not
have been possible to determine the parent q_vector of the ring.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d0759ebb051972f8557a19aa13cf02fc314856e9
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:09 2010 -0800
ixgbe: cleanup ixgbe_map_rings_to_vectors
This change cleans up some of the items in ixgbe_map_rings_to_vectors.
Specifically it merges the two for loops and drops the unnecessary vectors
parameter.
It also moves the vector names into the q_vectors themselves.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 125601bf03a13e24d3785ccbc3a25ad401c92772
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:08 2010 -0800
ixgbe: simplify math and improve stack use of ixgbe_set_itr functions
This change is meant to improve the stack utilization and simplify the math
used in ixgbe_set_itr_msix.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit bf29ee6c4819a86ba0209281550b230889b8ebe6
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:07 2010 -0800
ixgbe: cleanup unclear references to reg_idx
There are a number of places where we use the variable j to contain the
register index of the ring. Instead of using such a non-descriptive
variable name it is better that we name it reg_idx so that it is clear what
the variable contains.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9d6b758f428d2ad9ca4208d5c4d4cdbd4261b0d8
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:06 2010 -0800
ixgbe: cleanup unnecessary return value in ixgbe_cache_ring_rss
This change is just to cleanup some confusing logic in ixgbe_cache_ring_rss
which can be simplified by adding a conditional with return to the start of
the call.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 673ac60461082e07be58b23f237d651c2605ce60
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:05 2010 -0800
ixgbe: Cleanup DCB logic, whitespace, and comments in ixgbe_ethtool.c
This change address a few whitespace issues in DCB #ifdefs, adds a comment
calling out the DCB specific registers, and nests an if statement inline
with a number of if statements related to flow control.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 50d6c681d0c38208e494f0c6302ef13d21dababa
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:05 2010 -0800
ixgbe: add WOL support for backplane adapters
This change adds support for certain 82599 based Mezzanine adapters.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e2b4e216b7e9da09175c76887c754489681533b9
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:04 2010 -0800
ixgbe: cleanup ixgbe_set_tx_csum ethtool flags configuration
This change makes it so that we always disable SCTP regardless of mac type
since we shouldn't need to check mac type before disabling a feature that
isn't supported on a given piece of hardware.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit bd50817859e7e82ba6e4adc75ebd8ac19459d8a4
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:03 2010 -0800
ixgbe: change mac_type if statements to switch statements
This change replaces a number of if/elseif/else statements with switch
statements to support the addition of future devices to the ixgbe driver.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit aa80175a539a47fd11e2fbf1696a29f7a2652930
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:02 2010 -0800
ixgbe: cleanup use of ixgbe_rsc_count and RSC_CB
This change cleans up the use of rsc_count and changes it to a boolean since
the actual numerical value is used nowhere in the Rx cleanup path. I am
also moving the skb count into the RSC_CB path since it is much easier to
track it there than when it is passed as a parameter to various function
calls.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ee9e0f0b40c4fb4ad71d677c094d518db42f7076
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:01 2010 -0800
ixgbe: cleanup ATR filter setup function
This change cleans up the ixgbe_atr filter setup function so that it uses
fewer items from the stack. Since the code is only applicable to IPv4 w/
TCP it makes sense to just use the pointers based on the headers themselves
instead of copying them to temp variables and then writing those to the
filters.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c267fc166a3308c45c7f0ad2ddd6fc696caaeb80
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:00 2010 -0800
ixgbe: cleanup ixgbe_clean_rx_irq
The code for ixgbe_clean_rx_irq was much more tangled up than it needed to
be in terms of logic statements and unused variables. This change
untangles much of that and drops several unused variables such as cleaned
which was being returned but never checked.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 32aa77a4fc06bd1116f83c25bf0389a3e9b80533
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:59 2010 -0800
ixgbe: change vector numbering so that queues end up on correct CPUs
This changes the numbering scheme slightly. Previously the ordering was
coming out like this:
Rx-2
Rx-1
Rx-0
TxRx-0
Which would drop two queues on CPU 0. This change makes it so that the
ordering is like this:
Rx-3
Rx-2
Rx-1
TxRx-0
This means that each CPU will have it's own Rx queue, and only CPU 0 will
have the Tx queue.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b953799ee29075afd30afe4c0fb65f278b088f69
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:58 2010 -0800
ixgbe: reorder Tx cleanup so that if adapter will reset we don't rearm
The code as it existed could re-arm the queues when it was requesting a HW
reset due to a TX hang. Instead of doing that this change makes it so that
we will just exit if the hardware is believed to be hung.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 80fba3f4341b1c98430bee620b507d3f5b7086cd
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:57 2010 -0800
ixgbe: Disable RSC when ITR setting is too high to allow RSC
RSC will flush its descriptors every time the interrupt throttle timer
expires. In addition there are known issues with RSC when the rx-usecs
value is set too low. As such we are forced to clear the RSC_ENABLED bit
and reset the adapter when the rx-usecs value is set too low.
However we do not need to clear the NETIF_F_LRO flag because it is used to
indicate that the user wants to leave the LRO feature enabled, and in fact
with this change we will now re-enable RSC as soon as the rx-usecs value is
increased and the flag is still set.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 73c4b7cdd25a8a769baf6dae5bc498400a9ddd93
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:57 2010 -0800
ixgbe: cleanup race conditions in link setup
This change makes it so that we perform link setup with interrupts
disabled. If the SFP has not been detected previously we will schedule the
SFP detection task to run in order to detect link. By doing this we avoid
the possibility of interrupts firing in the middle of our link setup during
ixgbe_up_complete.
In addition this change makes it so that the multi-speed fiber setup and SFP
setup are not mutually exclusive. The addresses issues seen in which a
link would only come up at 1G on some multi-speed fiber modules.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 7d637bcc8f461f19e1d018078792ec0cd9b07b1d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:56 2010 -0800
ixgbe: add a state flags to ring
This change adds a set of state flags to the rings that allow them to
independently function allowing for features like RSC, packet split, and
TX hang detection to be done per ring instead of for the entire device.
This is accomplished by re-purposing the flow director reinit_state member
and making it a global state instead since a long for a single bit flag is
a bit wasteful.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 33cf09c9586a0dce472ecd2aac13e8140c9ed1a1
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:55 2010 -0800
ixgbe: move CPU variable from ring into q_vector, add ring->q_vector
This is the start of work to sort out what belongs in the rings and what
belongs in the q_vector. Items like the CPU variable for make much more
sense in the q_vector since the CPU is a per-interrupt thing rather than a
per ring thing.
I also added a back-pointer from the ring to the q_vector.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c60fbb00f0400792adf873dbacd431885653b77d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:54 2010 -0800
ixgbe: move adapter into pci_dev driver data instead of netdev
This change moves an adapter pointer into the private portion of the
pci_dev instead of a pointer to the netdev. The reason for this change is
because in most cases we just want the adapter anyway. In addition as we
start moving toward multiple netdevs per port we may want to move the
adapter pointer out of the netdevs entirely.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 01fa7d905fe9a5b045615fbde19e6c0f78063206
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:53 2010 -0800
ixgbe: remove residual code left over from earlier combining of TXDCTL
Missed some code that was left floating around in the DCB configuration
for the TXDCTL register. As a result the register was being messed with in
two different spots when we only needed to do the change once.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:52 2010 -0800
ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state
The main reason for this change is to keep the suspend/resume logic matched
up. The clear_interrupt_scheme function will disable MSI-X which will
effect the PCIe configuration space. Therefore we will want to do it before
we save state to avoid having the interrupt state restored by
pci_restore_state, and then trying to re-enable MSI/MSI-X interrupts via
ixgbe_setup_interrupt_scheme.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit fc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:51 2010 -0800
ixgbe: add a netdev pointer to the ring structure
This change places a netdev pointer directly into the ring structure. This
way we can avoid having to determine which netdev we are supposed to be
using and can just access the one on the ring directly.
As a result of this change further collapse of the code is possible by
dropping the adapter from ixgbe_alloc_rx_buffers, and the netdev pointer
from ixgbe_xmit_frame_ring_adv and ixgbe_maybe_stop_tx.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5b7da51547cc3ab5461e45a8ee0ca73051416fda
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:50 2010 -0800
ixgbe: combine some stats into a union to allow for Tx/Rx stats overlap
This change moved some of the RX and TX stats into separate structures and
them placed those structures in a union in order to help reduce the size of
the ring structure.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b6ec895ecd32c0070c3b2b17918c030275cd834d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:49 2010 -0800
ixgbe: move device pointer into the ring structure
This change is meant to simplify DMA map/unmap by providing a device
pointer. As a result the adapter pointer can be dropped from many of
the calls.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 84ea2591e4a24775c2735511a1cc3cf88edd249d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:49 2010 -0800
ixgbe: drop ring->head, make ring->tail a pointer instead of offset
This change drops ring->head since it is not used in any hot-path and can
easily be determined using IXGBE_[RT]DH(ring->reg_idx).
It also changes ring->tail into a true pointer so we can avoid unnecessary
pointer math to find the location of the tail.
In addition I also dropped the setting of head and tail in
ixgbe_clean_[rx|tx]_ring. The only location that should be setting the head
and tail values is ixgbe_configure_[rx|tx]_ring and that is only while the
queue is disabled.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d5f398ed73522b9f76861af6553775c5851de0d0
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:48 2010 -0800
ixgbe: cleanup ixgbe_alloc_rx_buffers
This change re-orders alloc_rx_buffers to make better use of the packet
split enabled flag. The new setup should require less branching in the
code since now we are down to fewer if statements since we either are
handling packet split or aren't.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 8ad494b0e59950e2b4e587c32cb67a2452795ea0
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:47 2010 -0800
ixgbe: move GSO segments and byte count processing into ixgbe_tx_map
This change simplifies the work being done by the TX interrupt handler and
pushes it into the tx_map call. This allows for fewer cache misses since
the TX cleanup now accesses almost none of the skb members.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 4c0ec6544a0cd5e3eed08df2c14cf98185098abe
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:46 2010 -0800
ixgbe: remove unnecessary re-init of adapter on Rx-csum change
There is no need to reset the adapter when changing the Rx checksum
settings. Since the only change is a software flag we can disable it
without needing to reset the entire adapter.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 80ab193dce048e7b7afa43c99e69f508167e29ab
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:26:45 2010 -0800
ixgbe: DCB: credit max only needs to be gt TSO size for 82598
The maximum credits per traffic class only needs to be greater
then the TSO size for 82598 devices. The 82599 devices do not
have this requirement so only do this test for 82598 devices.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 16b61beb39f2446460f93c08d4d263dc24f22dd8
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:26:44 2010 -0800
ixgbe: DCB set PFC high and low water marks per data sheet specs
Currently the high and low water marks for PFC are being set
conservatively for jumbo frames. This means the RX buffers
are being underutilized in the default 1500 MTU. This patch
fixes this so that the water marks are set as described in
the data sheet considering the MTU size.
The equation used is,
RTT * 1.44 + MTU * 1.44 + MTU
Where RTT is the round trip time and MTU is the max frame size
in KB. To avoid floating point arithmetic FC_HIGH_WATER is
defined
((((RTT + MTU) * 144) + 99) / 100) + MTU
This changes how the hardware field fc.low_water and
fc.high_water are used. With this change they are no longer
storing the actual low water and high water markers but are
storing the required head room in the buffer. This simplifies
the logic and we do not need to account for the size of the
buffer when setting the thresholds.
Testing with iperf and 16 threads showed a slight uptick in
throughput over a single traffic class .1-.2Gbps and a reduction
in pause frames. Without the patch a 30 second run would show
~10-15 pause frames being transmitted with the patch ~2-5 are
seen. Test were run back to back with 82599.
Note RXPBSIZE is in KB and low and high water marks fields are
also in KB. However the FCRT* registers are 32B granularity and
right shifted 5 into the register,
(((rx_pbsize - water_mark) * 1024) / 32) << 5
is the most explicit conversion here we simplify
(rx_pbsize - water_mark) * 32 << 5 = (rx_pbsize - water_mark) << 10
This patch updates the PFC thresholds and legacy FC thresholds.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 66c87bd50ddae681ebedfda0d75e6e73ecd29ce7
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:26:43 2010 -0800
ixgbevf: Update Version String and Copyright Notice
Update version string and copyright notice.
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 1a51502bddca7ac1e921d918b741ffd2bec149ed
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 19:26:42 2010 -0800
ixgbe: delay rx_ring freeing
"cat /proc/net/dev" uses RCU protection only.
Its quite possible we call a driver get_stats() method while device is
dismantling and freeing its data structures.
So get_stats() methods must be very careful not accessing driver private
data without appropriate locking.
In ixgbe case, we access rx_ring pointers. These pointers are freed in
ixgbe_clear_interrupt_scheme() and set to NULL, this can trigger NULL
dereference in ixgbe_get_stats64()
A possible fix is to use RCU locking in ixgbe_get_stats64() and defer
rx_ring freeing after a grace period in ixgbe_clear_interrupt_scheme()
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Reported-by: Tantilov, Emil S <emil.s.tantilov(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 28d9cc7f21da6a70fc8c1516fa0ee5588572eb92
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Sat Nov 13 20:58:27 2010 +0530
ath9k_htc: Use macro for caldata array size
The calibration data variable size is based on the number of
channels available in the ath9k driver.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ef1b21f7eb074a8c8ddfea70ed70e988545c8d54
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Nov 12 08:47:07 2010 +0100
iwlwifi: kill elapsed_jiffies
Subtract of jiffies is fine even if one variable overwrap.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 70f3876f09ccf1f2819aee6caee9266b2c4b1622
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Nov 12 08:47:06 2010 +0100
iwlagn: simplify iwlagn_tx_skb
We can simplify length calculation in iwlagn_tx_skb, that function
is enough complex, without fuzz it more than necessary.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2cb7865648e44647a976875428c9dfd9d5553221
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Nov 12 08:47:05 2010 +0100
iwl3945: remove unused len_org variable
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8f0729b16ae354f9db89394fc1d2d65003455d56
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 15:07:23 2010 +0100
mac80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 885a46d0f7942d76c2f3860acb45f75237d3bb42
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 15:07:22 2010 +0100
cfg80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a619a4c0e1fd4e8c360c63d0df3fa0a401107d69
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Thu Nov 11 08:50:18 2010 +0200
mac80211: Add function to get probe request template for current AP
Chipsets with hardware based connection monitoring need to autonomically
send directed probe-request frames to the AP (in the event of beacon loss,
for example.)
For the hardware to be able to do this, it requires a template for the frame
to transmit to the AP, filled in with the BSSID and SSID of the AP, but also
the supported rate IE's.
This patch adds a function to mac80211, which allows the hardware driver to
fetch this template after association, so it can be configured to the hardware.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Acked-by: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4e8c14e9587c38f4cce8049c766935629fdb8d46
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:38 2010 +0100
ath9k_hw: add a private op for configuring radar pulse detection
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 82b873afe83c81d9b1273a816bbdacb266f71a52
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:37 2010 +0100
ath9k: clean up tx buffer setup
Merge ath_tx_send_normal and ath_tx_send_ht_normal.
Move the paprd state initialization and sequence number assignment
to reduce the number of redundant checks.
This not only simplifies buffer allocation error handling, but also
removes a small inconsistency in the buffer HT flag.
This flag should only be set if the frame is also a QoS data frame.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 61117f01e79f7c0da86c23535bed757370f5885f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:36 2010 +0100
ath9k: remove the tx info padding byte abuse
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f0c255a07fe8a4d450cce6355a22b73ee0e9e6e0
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:35 2010 +0100
ath9k: handle tx underrun in the driver instead of rate control
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1d666d8e05edf5891a7a4bd84a25f493f01dc71a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:34 2010 +0100
ath9k: remove the unnecessary private xretry tx flag
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7afbb2f07028183f50ae4f7ce4dab1f32b36cf48
Author: Ben Greear <greearb(a)candelatech.com>
Date: Wed Nov 10 11:43:51 2010 -0800
ath5k: Cleanup opmode setting logic.
An earlier review suggested moving the code in a small
method that was only called once inline. This patch
accomplishes that.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Acked-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6ee63f55c7754462a45315ac93027a1df60667c9
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:16 2010 -0800
ath9k_hw: Fix low throughput issue with AR93xx
TX underruns were noticed when RTS/CTS preceded aggregates.
This issue was noticed in ar93xx family of chipsets only.
The workaround involves padding the RTS or CTS length up
to the min packet length of 256 bytes required by the
hardware by adding delimiters to the fist descriptor of
the aggregate.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 39ec2997c374b528cdbf65099b6d6b8593a67f7f
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:15 2010 -0800
ath9k: Fix bug in delimiter padding computation
There is a roundng error in delimiter padding computation
which causes severe throughput drop with some of AR9003.
signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Cc:stable@kernel.org
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bc2068020bfa976efd425f3be590f58a012fd747
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:14 2010 -0800
ath9k_hw: Add helper function for interpolation
Also round off interpolated values this would improve power
accuracy by 0.5dB in some cases.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 15cbbc44cc4abaaebc37caf0ec9410a3f83d1deb
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:13 2010 -0800
ath9k_hw: Improve power control accuracy for AR9003
It is done for 5Ghz by adding three temperature slopes.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f4475a6e52fce8d951a96c763f36b835bf89fdec
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:12 2010 -0800
ath9k_hw: Enable strong signal detection for AR9003
Attenuation from eeprom is configured into attenuator control
register.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 52a0e2477dac2106bc1688cbe9615cdafc9deb7d
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:11 2010 -0800
ath9k_hw: Fix XPABIAS level configuration for AR9003
Improper configuration of 0x16288 and 0x16290 would affect transmission.
Cc:stable@kernel.org
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3092354970381fb8b6439fb4def0c34632277ae9
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:10 2010 -0800
ath9k_hw: add eeprom templates for ar9003 family chipsets
We are currently using the default eeprom default and it doesn't
work properly for all ar9003 family chipsets. So add eeprom
templates for different versisons and select the eeprom table
based on the template version programmed in the eeprom.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3ceb801bffb62bc486f9662cd4dbca2cbdc6f5c7
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:09 2010 -0800
ath9k_hw: Fix paprd training frame failure.
paprd training frame fails in some rates. Fix the rate mask.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ef5a6a7573b7a12ced67dae155be8a909bc245d6
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:08 2010 -0800
ath9k_hw: Initialize 2GHz CTL properly.
The last 2GHz CTL was not being initialized, so power was being
set to 0 instead of 30dbm. Initialize to 30 like other CTLs.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b3dd6bc1f052ef3a754fa866743e4fda38522811
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:07 2010 -0800
ath9k_hw: Add new member into the eeprom structure.
Add eeprom base extension structures which are needed for
AR938x caliberation changes and gain calculation.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a9d85fbd3e5f7a0679e6276953cd23ac7bb72789
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Thu Nov 11 00:40:33 2010 -0800
ath9k_hw: Fix a reset failure on AR9382 (2x2).
AR9382 needs to be configured for the correct chain mask before
running AGC/TxIQ caliberation. Otherwise reset would fail.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 72a801103f07182c0a4f3a761caa62b4ab8eb4e5
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 10 12:51:01 2010 +0900
ath5k: Add support for antenna configuration
Support setting the antenna configuration via cfg/mac80211. At the moment only
allow the simple pre-defined configurations we already have (fixed antenna A/B
or diversity), but more advanced settings are possible to implement.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 15d967532148a5fcda075282b82a271b6595a386
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 10 12:50:56 2010 +0900
mac80211: Add antenna configuration
Allow antenna configuration by calling driver's function for it.
We disallow antenna configuration if the wiphy is already running, mainly to
make life easier for 802.11n drivers which need to recalculate HT capabilites.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit afe0cbf87500f0585d217deb8c6fd329793a7957
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 10 12:50:50 2010 +0900
cfg80211: Add nl80211 antenna configuration
Allow setting of TX and RX antennas configuration via nl80211.
The antenna configuration is defined as a bitmap of allowed antennas to use.
This API can be used to mask out antennas which are not attached or should not
be used for other reasons like regulatory concerns or special setups.
Separate bitmaps are used for RX and TX to allow configuring different antennas
for receiving and transmitting. Each bitmap is 32 bit long, each bit
representing one antenna, starting with antenna 1 at the first bit. If an
antenna bit is set, this means the driver is allowed to use this antenna for RX
or TX respectively; if the bit is not set the hardware is not allowed to use
this antenna.
Using bitmaps has the benefit of allowing for a flexible configuration
interface which can support many different configurations and which can be used
for 802.11n as well as non-802.11n devices. Instead of relying on some hardware
specific assumptions, drivers can use this information to know which antennas
are actually attached to the system and derive their capabilities based on
that.
802.11n devices should enable or disable chains, based on which antennas are
present (If all antennas belonging to a particular chain are disabled, the
entire chain should be disabled). HT capabilities (like STBC, TX Beamforming,
Antenna selection) should be calculated based on the available chains after
applying the antenna masks. Should a 802.11n device have diversity antennas
attached to one of their chains, diversity can be enabled or disabled based on
the antenna information.
Non-802.11n drivers can use the antenna masks to select RX and TX antennas and
to enable or disable antenna diversity.
While covering chainmasks for 802.11n and the standard "legacy" modes "fixed
antenna 1", "fixed antenna 2" and "diversity" this API also allows more rare,
but useful configurations as follows:
1) Send on antenna 1, receive on antenna 2 (or vice versa). This can be used to
have a low gain antenna for TX in order to keep within the regulatory
constraints and a high gain antenna for RX in order to receive weaker signals
("speak softly, but listen harder"). This can be useful for building long-shot
outdoor links. Another usage of this setup is having a low-noise pre-amplifier
on antenna 1 and a power amplifier on the other antenna. This way transmit
noise is mostly kept out of the low noise receive channel.
(This would be bitmaps: tx 1 rx 2).
2) Another similar setup is: Use RX diversity on both antennas, but always send
on antenna 1. Again that would allow us to benefit from a higher gain RX
antenna, while staying within the legal limits.
(This would be: tx 0 rx 3).
3) And finally there can be special experimental setups in research and
development even with pre 802.11n hardware where more than 2 antennas are
available. It's good to keep the API simple, yet flexible.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
--
v7: Made bitmasks 32 bit wide and rebased to latest wireless-testing.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0e67d6cb753643fc076a90fa9309301b3fbfb8db
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 16:35:19 2010 -0800
drivers/net/wireless/b43legacy/main.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5b736d42bc51fe893fd7d4ceac34c727d23135e1
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 16:35:18 2010 -0800
drivers/net/wireless/b43/main.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7e559ec31c5625cf85bcb1ae0eb9f8f2a8da4a29
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 16:35:17 2010 -0800
drivers/net/wireless/ath/debug.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5cb56af29be8d12f74afcb2c1de91e51a577bd52
Author: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Date: Tue Nov 9 19:25:56 2010 +0200
rndis_wlan: workaround poor scanning with BCM4320a
BCM4320a devices seem to sometimes do scanning pretty poorly. This can be
workaround by issuing new scan every second, while not yet connected. By this
new scanning method device catches beacons much faster. Fixes bug #20822.
Reported-by: Luís Picciochi <Pitxyoki(a)gmail.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b5257c952dda24df7078c74b7b811b44c6e49206
Author: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Date: Tue Nov 9 19:25:47 2010 +0200
rndis_wlan: workaround device not returning bss for currently connected AP
BCM4320a devices do not return bss for currently connected AP in bss-list,
althought this is required by NDIS specs. Missing bss leads to warning at
net/wireless/sme.c:__cfg80211_connect_result(), WARN_ON(!bss).
Workaround this by crafting bss manually with information we can read from
device. Workaround is only used when device bss-list does not return current
bss, and so is only used with BCM4320a devices and not newer BCM4320b ones.
Fixes bug #20152.
Reported-by: Luís Picciochi <Pitxyoki(a)gmail.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f23a478075659db8a4fd62fa6e264a8bb052cc5b
Author: Arik Nemtsov <arik(a)wizery.com>
Date: Mon Nov 8 11:51:06 2010 +0200
mac80211: support hardware TX fragmentation offload
The lower driver is notified when the fragmentation threshold changes
and upon a reconfig of the interface.
If the driver supports hardware TX fragmentation, don't fragment
packets in the stack.
Signed-off-by: Arik Nemtsov <arik(a)wizery.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ca4a0831917d6541b45f03542257fcb20dc9cf4a
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 3 23:28:45 2010 +0100
ssb: return -ENOMEM on alloc fail (instead of CRC check's result)
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 54435f9ec837cf0bb0ea02a2bb6362a6aaef5250
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 3 22:06:26 2010 +0100
ssb: workarounds: be verbose about hacking SPROM revision, don't duplicate code
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d1f9e41d1d739cd4393840d35e7554f4a439a4f1
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:53 2010 -0800
mwl8k: use const struct fw pointers throughout
This eliminates compiler warnings by doing things how the
firmware class expects.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 99020471001dbbd6edf61f105368cb6667cc683d
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:52 2010 -0800
mwl8k: make initial firmware load asynchronous
Introduce a firmware loading state machine to manage the process
of loading firmware asynchronously and completing initialization
upon success. The state machine attempts to load the preferred
firmware image. If that fails, and if an alternative firmware
image is available, it will attempt to load that one.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 952a0e963fb02e50f4afbf502f7d468a8fe2b0fa
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:51 2010 -0800
mwl8k: add API version checking for AP firmware
The AP firmware specifies an API version in the GET_HW_SPEC
command response. Currently, the driver only supports AP
firmware for the 8366, and only supports API v1. In the future,
if higher API version firmwares emerge (possibly for different
chips), different ops can be selected based on the reported API
version.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0863ade8d6bde1d151f75720d999ff27f9fe3533
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:50 2010 -0800
mwl8k: choose proper firmware image as directed by user
The mwl8k can operate in AP or STA mode, depending on the
firmware image that is loaded. By default, STA firmware is
loaded. Allow the user to override this default mode at
module load time. This saves an unnecessary firmware reload
for users only interested in AP mode.
Also, the firmware image can be swapped to meet the user's
add_interface request. For example, suppose the STA
firmware is loaded, no STA interface has been added, and the
user adds an AP interface. In this case, the AP firmware
will be loaded to meet the request.
Based on contributions from Pradeep Nemavat <pnemavat(a)marvell.com>,
Yogesh Powar <yogeshp(a)marvell.com>, and
Lennert Buytenhek <buytenh(a)wantstofly.org>.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3cc7772c0a3cc193fa9873816168bd34d4f16837
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:49 2010 -0800
mwl8k: factor out firmware loading and hw init code
This is in preparation for supporting different fw images for
different interface types, and for supporting asynchronous
firmware loading.
Based on a patch from Pradeep Nemavat <pnemavat(a)marvell.com>
and Yogesh Powar <yogeshp(a)marvell.com>
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 41fdf0974d9eb81215cb578211a6d8f8a022a9eb
Author: Nishant Sarmukadam <nishants(a)marvell.com>
Date: Fri Nov 12 17:23:48 2010 -0800
mwl8k: rf_tx_power cmd not supported by AP firmware APIv1
APIv1 AP firmware does not support the RF_TX_POWER command. It
supports the similar TX_POWER command.
Signed-off-by: Pradeep Nemavat <pnemavat(a)marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants(a)marvell.com>
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:47 2010 -0800
mwl8k: revert unnecessary modification of tx descriptor
This reverts change 783391c443728febc669e40597193308460e7b4f.
The stabilized AP v1 firmware uses the same tx descriptor as
the STA firmware.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae63a33ec9b598b3454cf0d29077fa17b616c42a
Author: Deepak Saxena <dsaxena(a)laptop.org>
Date: Sun Oct 31 13:40:33 2010 +0000
libertas: EHS_REMOVE_WAKEUP is not always supported
Certain firmware versions, particularly the 8388 found on the XO-1,
do not support the EHS_REMOVE_WAKEUP command that is used to disable
WOL. Sending this command to the card will return a failure that
would get propagated up the stack and cause suspend to fail.
Instead, fall back to an all-zero wakeup mask.
This fixes http://dev.laptop.org/ticket/9967
Signed-off-by: Deepak Saxena <dsaxena(a)laptop.org>
Signed-off-by: Daniel Drake <dsd(a)laptop.org>
[includes fixups by Paul Fox]
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cf43298864fdfd687202db8c736473522bfceb98
Author: Daniel Drake <dsd(a)laptop.org>
Date: Sun Oct 31 13:40:12 2010 +0000
libertas: don't block usb8388 suspend if no wakeup conditions are set
This hunk added by commit 66fceb69b72f seems erroneous. We don't want to
prevent suspend of the whole system if no wakeup params are set.
In the case of the usb8388 we do want to keep the card powered up even
if there are no wakeup params. This is because it will continue acting
as a mesh node.
If the mesh is disabled, it would indeed make more sense to power down
the card during suspend, as the equivalent hunk does for the SD interface.
But that's a separate task; for now just restore the previous behaviour.
Signed-off-by: Daniel Drake <dsd(a)laptop.org>
Acked-by: Dan Williams <dcbw(a)redhat.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9d1e5e40d6cac4bf7008e04c202d71918455ca11
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 3 05:56:38 2010 +0000
mpc52xx: cleanup locking
commit 1e4e0767ecb1 (Fix locking on fec_mpc52xx driver) assumed IRQ are
enabled when an IRQ handler is called.
It is not the case anymore (IRQF_DISABLED is deprecated), so we can use
regular spin_lock(), no need for spin_lock_irqsave().
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Tested-by: Jean-Michel Hautbois <jhautbois(a)gmail.com>
Cc: Asier Llano <a.llano(a)ziv.es>
Cc: Grant Likely <grant.likely(a)secretlab.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b178bb3dfc30d9555bdd2401e95af98e23e83e10
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 05:56:04 2010 +0000
net: reorder struct sock fields
Right now, fields in struct sock are not optimally ordered, because each
path (RX softirq, TX completion, RX user, TX user) has to touch fields
that are contained in many different cache lines.
The really critical thing is to shrink number of cache lines that are
used at RX softirq time : CPU handling softirqs for a device can receive
many frames per second for many sockets. If load is too big, we can drop
frames at NIC level. RPS or multiqueue cards can help, but better reduce
latency if possible.
This patch starts with UDP protocol, then additional patches will try to
reduce latencies of other ones as well.
At RX softirq time, fields of interest for UDP protocol are :
(not counting ones in inet struct for the lookup)
Read/Written:
sk_refcnt (atomic increment/decrement)
sk_rmem_alloc & sk_backlog.len (to check if there is room in queues)
sk_receive_queue
sk_backlog (if socket locked by user program)
sk_rxhash
sk_forward_alloc
sk_drops
Read only:
sk_rcvbuf (sk_rcvqueues_full())
sk_filter
sk_wq
sk_policy[0]
sk_flags
Additional notes :
- sk_backlog has one hole on 64bit arches. We can fill it to save 8
bytes.
- sk_backlog is used only if RX sofirq handler finds the socket while
locked by user.
- sk_rxhash is written only once per flow.
- sk_drops is written only if queues are full
Final layout :
[1] One section grouping all read/write fields, but placing rxhash and
sk_backlog at the end of this section.
[2] One section grouping all read fields in RX handler
(sk_filter, sk_rcv_buf, sk_wq)
[3] Section used by other paths
I'll post a patch on its own to put sk_refcnt at the end of struct
sock_common so that it shares same cache line than section [1]
New offsets on 64bit arch :
sizeof(struct sock)=0x268
offsetof(struct sock, sk_refcnt) =0x10
offsetof(struct sock, sk_lock) =0x48
offsetof(struct sock, sk_receive_queue)=0x68
offsetof(struct sock, sk_backlog)=0x80
offsetof(struct sock, sk_rmem_alloc)=0x80
offsetof(struct sock, sk_forward_alloc)=0x98
offsetof(struct sock, sk_rxhash)=0x9c
offsetof(struct sock, sk_rcvbuf)=0xa4
offsetof(struct sock, sk_drops) =0xa0
offsetof(struct sock, sk_filter)=0xa8
offsetof(struct sock, sk_wq)=0xb0
offsetof(struct sock, sk_policy)=0xd0
offsetof(struct sock, sk_flags) =0xe0
Instead of :
sizeof(struct sock)=0x270
offsetof(struct sock, sk_refcnt) =0x10
offsetof(struct sock, sk_lock) =0x50
offsetof(struct sock, sk_receive_queue)=0xc0
offsetof(struct sock, sk_backlog)=0x70
offsetof(struct sock, sk_rmem_alloc)=0xac
offsetof(struct sock, sk_forward_alloc)=0x10c
offsetof(struct sock, sk_rxhash)=0x128
offsetof(struct sock, sk_rcvbuf)=0x4c
offsetof(struct sock, sk_drops) =0x16c
offsetof(struct sock, sk_filter)=0x198
offsetof(struct sock, sk_wq)=0x88
offsetof(struct sock, sk_policy)=0x98
offsetof(struct sock, sk_flags) =0x130
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c31504dc0d1dc853dcee509d9999169a9097a717
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 19:58:26 2010 +0000
udp: use atomic_inc_not_zero_hint
UDP sockets refcount is usually 2, unless an incoming frame is going to
be queued in receive or backlog queue.
Using atomic_inc_not_zero_hint() permits to reduce latency, because
processor issues less memory transactions.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 213b15ca818adf7766cd7162c2159a6ecdd3bab8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 11 09:42:45 2010 +0000
vlan: remove ndo_select_queue() logic
Now vlan are lockless, we dont need special ndo_select_queue() logic.
dev_pick_tx() will do the multiqueue stuff on the real device transmit.
Suggested-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4af429d29b341bb1735f04c2fb960178ed5d52e7
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 10 23:42:00 2010 +0000
vlan: lockless transmit path
vlan is a stacked device, like tunnels. We should use the lockless
mechanism we are using in tunnels and loopback.
This patch completely removes locking in TX path.
tx stat counters are added into existing percpu stat structure, renamed
from vlan_rx_stats to vlan_pcpu_stats.
Note : this partially reverts commit 2e59af3dcbdf (vlan: multiqueue vlan
device)
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8ffab51b3dfc54876f145f15b351c41f3f703195
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 10 21:14:04 2010 +0000
macvlan: lockless tx path
macvlan is a stacked device, like tunnels. We should use the lockless
mechanism we are using in tunnels and loopback.
This patch completely removes locking in TX path.
tx stat counters are added into existing percpu stat structure, renamed
from rx_stats to pcpu_stats.
Note : this reverts commit 2c11455321f37 (macvlan: add multiqueue
capability)
Note : rx_errors converted to a 32bit counter, like tx_dropped, since
they dont need 64bit range.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Patrick McHardy <kaber(a)trash.net>
Cc: Ben Greear <greearb(a)candelatech.com>
Cc: Ben Hutchings <bhutchings(a)solarflare.com>
Acked-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman(a)tuxdriver.com>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Version 4 of this patch.
Change notes:
1) Removed extra memset. Didn't think kcalloc added a GFP_ZERO the way kzalloc did :)
Summary:
It was shown to me recently that systems under high load were driven very deep
into swap when tcpdump was run. The reason this happened was because the
AF_PACKET protocol has a SET_RINGBUFFER socket option that allows the user space
application to specify how many entries an AF_PACKET socket will have and how
large each entry will be. It seems the default setting for tcpdump is to set
the ring buffer to 32 entries of 64 Kb each, which implies 32 order 5
allocation. Thats difficult under good circumstances, and horrid under memory
pressure.
I thought it would be good to make that a bit more usable. I was going to do a
simple conversion of the ring buffer from contigous pages to iovecs, but
unfortunately, the metadata which AF_PACKET places in these buffers can easily
span a page boundary, and given that these buffers get mapped into user space,
and the data layout doesn't easily allow for a change to padding between frames
to avoid that, a simple iovec change is just going to break user space ABI
consistency.
So I've done this, I've added a three tiered mechanism to the af_packet set_ring
socket option. It attempts to allocate memory in the following order:
1) Using __get_free_pages with GFP_NORETRY set, so as to fail quickly without
digging into swap
2) Using vmalloc
3) Using __get_free_pages with GFP_NORETRY clear, causing us to try as hard as
needed to get the memory
The effect is that we don't disturb the system as much when we're under load,
while still being able to conduct tcpdumps effectively.
Tested successfully by me.
Signed-off-by: Neil Horman <nhorman(a)tuxdriver.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Maciej Żenczykowski <zenczykowski(a)gmail.com>
Reported-by: Maciej Żenczykowski <zenczykowski(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 020f01ebd04f3429c32586d90598c9f59e54ca7d
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 14:35:16 2010 +0000
drivers/isdn/mISDN: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3654654f7aa79a37dde130afb7409c55b11807e7
Author: Jan Engelhardt <jengelh(a)medozas.de>
Date: Tue Nov 16 09:52:32 2010 -0800
netlink: let nlmsg and nla functions take pointer-to-const args
The changed functions do not modify the NL messages and/or attributes
at all. They should use const (similar to strchr), so that callers
which have a const nlmsg/nlattr around can make use of them without
casting.
While at it, constify a data array.
Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Mon Nov 15 20:29:21 2010 +0000
ipv6: fix missing in6_ifa_put in addrconf
Fix ref count bug introduced by
commit 2de795707294972f6c34bae9de713e502c431296
Author: Lorenzo Colitti <lorenzo(a)google.com>
Date: Wed Oct 27 18:16:49 2010 +0000
ipv6: addrconf: don't remove address state on ifdown if the address
is being kept
Fix logic so that addrconf_ifdown() decrements the inet6_ifaddr
refcnt correctly with in6_ifa_put().
Reported-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b5e4156743c5d42b736936be7a9ee8d72e0e4ac9
Merge: 6b35308 b1d771e
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 16 09:17:12 2010 -0800
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 9e2e7422d059f9b98c3a0810df92a1ff660ade2f
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Fri Nov 12 13:52:37 2010 -0800
iwlwifi: set STATUS_READY before commit_rxon
Have the STATUS_READY bit set before commit_rxon call to avoid fail
to send tx power to uCode.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 6163a3735aad19bdb8d02b3362d3a2d7d2eb78d5
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Fri Nov 12 13:48:13 2010 -0800
iwlagn: check change before commit RXON cmd
When setting rxon chain and filter, no need to commit RXON when the
chain flag is not changed. This reduces the number of RXON commands
we send down to uCode.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 21a5b3c6b19a8b8972ccdd55389be28a8b7c9180
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 13:32:59 2010 -0800
iwlagn: use SKU information in the EEPROM
EEPROM contain the SKU information for the device, use it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit f4115d46599464a49a3055d33d499d97ac81fccb
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Wed Nov 10 18:25:58 2010 -0800
iwlagn: update QoS before commit associated RXON
RXON command without association bit can clear the QoS info in the
uCode. Therefore, before sending the associated RXON, we need to
send the QoS command just in case.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit efe54db8233a4b41e68cbe67ca2e30c48532078a
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:49 2010 -0800
iwlagn: fix PAN slot timing wrt. DTIM
When the DTIM is not 1, then the slot timing is in
some cases required to be calclulated based on the
DTIM interval instead of the beacon interval, fix
that.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 2b5f7a679c2ae34407f6cc9387e77b563578bfdc
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:48 2010 -0800
iwlagn: reprogram AP STA after assoc
Instead of unconditionally sending unassoc RXON,
before any assoc RXON, re-send only the AP STA
entry which is required after the BSSID has been
programmed into the device to set up internal
filters in the microcode properly.
This fixes some issues that we correlated with
sending a lot of RXON commands to the device.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 893654de3ff41a4f5037397d06a3f853bbbb3484
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:47 2010 -0800
iwlagn: avoid crash if vif is not assigned
For reasons that aren't entirely clear to me,
we sometimes get here during hardware reset
without the interface being set. Don't crash,
but keep a warning.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit cfa1da7e9133be9280990b2a64fa7696924c8d9a
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:46 2010 -0800
iwlagn: fix PAN queues
Currently, when a PAN queue needs to be
stopped, we erroneously stop queue number 5
(for example) with mac80211 -- which doesn't
even exist!
To avoid that problem, recalculate the swq_id
for all queues when setting up the queues,
and don't use the default identity mapping
that is acceptable for devices which don't
support PAN.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit ea9b307f8e859186a6791e0d508c5993448ac900
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:45 2010 -0800
iwlwifi: always build swq_id as virtual queue ID
Previously, we used the swq_id's mechanism
to have AC and HW queue different only for
aggregation queues. To be able to fix a bug
with iPAN simply always build the swq_id as
ac | (hwq << 2) and remove the flag bit.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 549a04e092e5e043df82fd0541f3b67ab488359b
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:44 2010 -0800
iwlwifi: pass txq to wake/stop queue
Instead of passing the txq->swq_id, pass the
txq struct directly to make sure that in the
future nobody will pass an invalid number.
Only three places actually change from using
the txq_id or the skb's queue_mapping to now
using txq->swq_id as well.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 4bea9b990205e4a3d432d9d6c29687215618a306
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:43 2010 -0800
iwlagn: remove a bogus AGG_OFF check
Even if this check were to happen, using the
txq_id here (which is a HW queue) would lead
to confusion in mac80211. Luckily, it doesn't
seem like this can ever happen.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 8d56396ac3926412dd97dcb9dd8d0cef556b908e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:42 2010 -0800
iwlagn: remove unused variable swq_id
Simply remove the unused variable swq_id.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:41 2010 -0800
iwlagn: fix some naming regarding FIFOs
Some variables are misnamed in the FIFO setup
code, fix that.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 564b344c10b694d433cef5b89f8ff8ac5e33898d
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 9 09:21:34 2010 -0800
iwlwifi: change default led mode for different devices
Set the default led mode for different devices.
For the newer devices such as 6000g2a, 6000g2b and newer,
the default led mode is On/Off instead of blinking.
The led_mode still can be control through module parameter
0: system default
1: On/Off
2: blinking
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 05433df23cf16a9ccbdd35964aba781cdf455034
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 8 12:37:20 2010 -0800
iwlagn: change default ACK/CTS MASK setting for WiFi/BT coex
Change the default BT_KILL_ACK_MASK and BT_KILL_CTS_MASK for BT coex
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 66e863a527f9ed3a871797862aaf0d62b0954813
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 8 14:54:37 2010 -0800
iwlagn: support dynamic aggregation for BT coex
Use dynamic aggregation threshold if bt traffic load is high
to reduce the impact on aggregated frame.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 95a5ede3ee9269e175bfe0e6f5a4a5fd2914ed6a
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 8 14:55:43 2010 -0800
iwlagn: set dynamic aggregation threshold for BT
Setting the max/min/def value for BT dynamic aggregation threshold.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 8829c9e2ec144baeb3cee599e1e653a396ad521b
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 11:05:38 2010 -0800
iwlagn: used frame count info in compressed ba packet
For newer devices, uCode provide both "number of frames sent"
and "number of frames acked" information inside the compressed_ba
packet. So instead of figure the success/failure information through
the bitmap, use those information which is much betrer approach.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 6b35308850e1679741e8b646cfb7bb3ab5369888
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 20:15:03 2010 -0800
net: Export netif_get_vlan_features().
ERROR: "netif_get_vlan_features" [drivers/net/xen-netfront.ko] undefined!
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1f4f067f99cbb2af7af7a67bd025a9fb58b5156c
Author: Vasanthy Kolluri <vkolluri(a)cisco.com>
Date: Mon Nov 15 08:09:55 2010 +0000
enic: Fix build warnings
Fix data type of argument passed to pci_alloc_consistent and pci_free_consistent routines.
Signed-off-by: Vasanthy Kolluri <vkolluri(a)cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ce5a121304af02d02489e86efb6ae26a67f95e52
Author: Alan Cox <alan(a)linux.intel.com>
Date: Mon Nov 15 07:30:42 2010 +0000
hso: Fix unused variable warning
Fallout from the TIOCGICOUNT work
Signed-off-by: Alan Cox <alan(a)linux.intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ec1e5610c00c7f5bc530d2aadd47faa473b90a30
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 06:38:14 2010 +0000
bridge: add RCU annotations to bridge port lookup
br_port_get() renamed to br_port_get_rtnl() to make clear RTNL is held.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b5ed54e94d324f17c97852296d61a143f01b227a
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 15 06:38:13 2010 +0000
bridge: fix RCU races with bridge port
The macro br_port_exists() is not enough protection when only
RCU is being used. There is a tiny race where other CPU has cleared port
handler hook, but is bridge port flag might still be set.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 61391cde9eefac5cfcf6d214aa80c77e58b1626b
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 15 06:38:12 2010 +0000
netdev: add rcu annotations to receive handler hook
Suggested by Eric's bridge RCU changes.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a386f99025f13b32502fe5dedf223c20d7283826
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 06:38:11 2010 +0000
bridge: add proper RCU annotation to should_route_hook
Add br_should_route_hook_t typedef, this is the only way we can
get a clean RCU implementation for function pointer.
Move route_hook to location where it is used.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e80516880019aa1f7c5c410276edfea9575ec89f
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 06:38:10 2010 +0000
bridge: add RCU annotation to bridge multicast table
Add modern __rcu annotatations to bridge multicast table.
Use newer hlist macros to avoid direct access to hlist internals.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8a22c99a80b0926585cfcbcc423ee2c49c1fd820
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:05:00 2010 +0000
net/ipv6/mcast.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:58 2010 +0000
include/net/caif/cfctrl.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Sjur Braendeland <sjur.brandeland(a)stericsson.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c59504ebc5baa628706d10c2d3c7e1f4bc3c2147
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:57 2010 +0000
include/linux/if_macvlan.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 779bb41d4bd111d5631d58d1bf2d00b5c4389c80
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:37 2010 +0000
drivers/net/cnic.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e81a1ba815666ec02ef5bf0e17cf256c88d233b3
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:33 2010 +0000
drivers/net/ixgbe: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d51c4185bb369cb39ed8cc20b331508e47b35b2
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:32 2010 +0000
drivers/net/e1000e: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6f38ad93e4882e84c1cc113736db7dc9252dcf11
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:31 2010 +0000
drivers/net/bnx2x: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ad65ffd12dccf6d1031298eacc060327751084da
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:26 2010 +0000
drivers/isdn: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6c1b6c6b873d66d353ef47a054156dfde3f4c075
Merge: fe82224 7e87fe8
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 10:59:49 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit fe8222406c8277a21172479d3a8283d31c209028
Author: Tom Herbert <therbert(a)google.com>
Date: Tue Nov 9 10:47:38 2010 +0000
net: Simplify RX queue allocation
This patch move RX queue allocation to alloc_netdev_mq and freeing of
the queues to free_netdev (symmetric to TX queue allocation). Each
kobject RX queue takes a reference to the queue's device so that the
device can't be freed before all the kobjects have been released-- this
obviates the need for reference counts specific to RX queues.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ed9af2e839c06c18f721da2c768fbb444c4a10e5
Author: Tom Herbert <therbert(a)google.com>
Date: Tue Nov 9 10:47:30 2010 +0000
net: Move TX queue allocation to alloc_netdev_mq
TX queues are now allocated in alloc_netdev_mq and freed in
free_netdev.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cc9ff19da9bf76a2f70bcb80225a1c587c162e52
Author: Timo Teräs <timo.teras(a)iki.fi>
Date: Wed Nov 3 04:41:38 2010 +0000
xfrm: use gre key as flow upper protocol info
The GRE Key field is intended to be used for identifying an individual
traffic flow within a tunnel. It is useful to be able to have XFRM
policy selector matches to have different policies for different
GRE tunnels.
Signed-off-by: Timo Teräs <timo.teras(a)iki.fi>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1f2d8c2cc61d2b9472efe44e8a2b098336914b4
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 10:37:30 2010 -0800
vlan: Fix build warning in vlandev_seq_show()
net/8021q/vlanproc.c: In function 'vlandev_seq_show':
net/8021q/vlanproc.c:283:20: warning: unused variable 'fmt'
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b1d771ee33c6e4006676002b9d74abf45b71d3d6
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:11:23 2010 +0200
carl9170: use generic sign_extend32
This patch replaces the handcrafted
sign extension cruft with a generic
bitop function.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7919a57bc608140aa8614c19eac40c6916fb61d2
Author: Andreas Herrmann <andreas.herrmann3(a)amd.com>
Date: Mon Aug 30 19:04:01 2010 +0000
bitops: Provide generic sign_extend32 function
This patch moves code out from wireless drivers where two different
functions are defined in three code locations for the same purpose and
provides a common function to sign extend a 32-bit value.
Signed-off-by: Andreas Herrmann <andreas.herrmann3(a)amd.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e4b3fdb80021bc0a3239bfc2a873a6d7c6ac52a1
Author: Grazvydas Ignotas <notasas(a)gmail.com>
Date: Thu Nov 4 00:13:49 2010 +0200
wl1251: use wl12xx_platform_data to pass data
Make use the newly added method to pass platform data for wl1251 too.
This allows to eliminate some redundant code.
Cc: Ohad Ben-Cohen <ohad(a)wizery.com>
Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com>
Acked-by: Kalle Valo <kvalo(a)adurom.com>
Acked-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Acked-by: Tony Lindgren <tony(a)atomide.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1d4b89f2970f9ea0902d0a3bc1090f3c770b5080
Author: Grazvydas Ignotas <notasas(a)gmail.com>
Date: Mon Nov 8 15:29:36 2010 +0200
wl1251: add runtime PM support for SDIO
Add runtime PM support, similar to how it's done for wl1271.
This allows to power down the card when the driver is loaded but
network is not in use.
Cc: Ohad Ben-Cohen <ohad(a)wizery.com>
Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com>
Acked-by: Kalle Valo <kvalo(a)adurom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cb7bbc7a5535ab2333915b83391e1d846a0914df
Author: Grazvydas Ignotas <notasas(a)gmail.com>
Date: Thu Nov 4 00:13:47 2010 +0200
wl1251: add power callback to wl1251_if_operations
Call interface specific power callback before calling board specific
one. Also allow that callback to fail. This is how it's done for
wl1271 and will be used for runtime_pm support.
Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com>
Acked-by: Kalle Valo <kvalo(a)adurom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f81c1f48384d398dbe8f6c5b10377c7158086791
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:50 2010 -0800
iwlagn: enable shadow register
For 6000 series devices and up, enable automatic update MAC's register
for better power usage in PSP mode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6fe8efb2211fe61caa7b0e1c36c521670b8a10a9
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Wed Nov 10 09:56:49 2010 -0800
iwlwifi: disable disconnected antenna for advanced bt coex
Disconnected antenna algorithm is used to find out which antennas are
disconnected. It should be disabled for devices that support advanced
bluetooth coexist.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3031242b31dcd76e1c6b1c1718cfee872f55d5af
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Wed Nov 10 09:56:48 2010 -0800
iwlwifi: seperate disconnected antenna function
Disconnected antenna algorithm is seperated into its own function from chain noise
calibration routine for better code management.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2769b84d86a2d29fa131a763d2b23b112834420
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:47 2010 -0800
iwlagn: fix RXON HT
When the HT information is changed due to
BSS changes (like legacy stations joining)
we need to recalculate HT RXON parameters.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8da8e62851680772f0422d0f1c4b467190b268e5
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:46 2010 -0800
iwlagn: re-enable calibration
During the RXON rewrite, this code got lost.
When we've just associated, we need to enable
all calibrations and see if some were already
finished. Add back the missing code.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 52d980c01353202332ff4322f3f41db0c49816a5
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:45 2010 -0800
iwlagn: fix RXON issues
The RXON rework resulted in a massive loss of
throughput because we weren't programming the
device completely correctly -- the BSSID has
to be programmed into the device before the
AP station is uploaded. To fix this, simply
always send the unassoc RXON, i.e. even when
it was already unassoc so that the BSSID and
some other parameters are updated properly.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2e1fea43aa170e18beb8378465e595e18cd08f6e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:44 2010 -0800
iwlagn: fix needed chains calculation
Garen noticed that this was wrong. Fix
the calibration -- default to multiple
chains and fall back to single where
possible.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 35a6eb36520b938742d8680fd8d821df20982ced
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:43 2010 -0800
iwlwifi: resending QoS command when HT changes
"mac80211: Fix WMM driver queue configuration"
inadvertedly broke iwlwifi, because now mac80211
configures the QoS settings before assoc, and
therefore before HT. Thus, iwlwifi no longer told
the device about the HT setting, which it needs
to -- and thus throughput went down a lot. Fix
this by resending the QoS command to the device
not only when QoS/WMM settings change, but also
when HT changes.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fd11743dd25efe7157ff17b03dd2db0cbb6fed05
Author: Winkler, Tomas <tomas.winkler(a)intel.com>
Date: Wed Nov 10 09:56:42 2010 -0800
iwlwlifi: update rx write pointer w/o request mac access in the CAM mode
In iwl_rx_queue_update_write_ptr function
replace iwl_write_direct32 with iwl_write32 when not in power save mode.
We don't have to go through grab nic access as the NIC is already awake.
Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 708068db4c09f93937a6a83ac8fff8516f482b0f
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:41 2010 -0800
iwlwifi: legacy tx_cmd_protection function
Legacy (4965 and 3945) devices has different tx_cmd_protection routine.
Move to iwl-legacy.c
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e39fdee1d7856817619326fa114438c146d74510
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:40 2010 -0800
iwlwifi: put all the isr related function under ops
There were two type of isr supported by iwlwifi devices.
legacy isr - only used by legacy devices (3945 & 4965)
ict isr - used by all new generation of iwlwifi devices
Move all the isr related functions into ops, the ict type of isr
supports only needed for newer devices.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 81baf6ec9c190ae128748cf2a026bff5cb811b70
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:39 2010 -0800
iwlwifi: Legacy isr only used by legacy devices
Move iwl_isr_legacy function to iwl_legacy.c since it only used
by legacy devices.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae79d23d0b2c16998e60f49a16dae53521c76a45
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:38 2010 -0800
iwlagn: fix non-5000+ build
When building 4965 without 5000+ there were a
lot of build errors due to functions being used
that weren't even compiled in. To fix this move
some code around and only compile the HCMD code
for 5000+ series as it's not used for 4965.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2a21ff446c07b95d08cbb830bd20112f3ee1d76e
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:37 2010 -0800
iwlagn: update PCI ID for 100 series devices
Update the supported PCI ID list for 100 series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fb30eaf38703d7562606e49a5872745d66366a50
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:36 2010 -0800
iwlagn: update PCI ID for 6000g2a series devices
Update the supported PCI ID list for 6000g2a series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8b37d9f0a1e114a1c7f5082842fb310a81ea3732
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:35 2010 -0800
iwlagn: update PCI ID for 6000g2b series devices
Update the supported PCI ID list for 6000g2b series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5d882c97e2c958df9f8b78832fa1ecbecef6ea1d
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Nov 8 10:50:03 2010 -0800
ath5k: Print stats as unsigned ints.
The debugfs code for ath5k was printing some unsigned int
stats with %d instead of %u. This meant that you could see
negative numbers instead of a clean wrap.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c5765fda4b382acce4ff386e18ec11790dff893
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:49:01 2010 +0100
rt2x00: Add watchdog functions for HW queue
Add watchdog functions for managing the Queues inside the hardware.
Normally the driver doesn't have much to do with these queues
directly, but the Ralink drivers did implement watchdog functions
for these. These watchdog functions are not triggered that often,
compared to the other watchdog functions, but I have at least
seen them trigger once or twice during a long stresstest run.
v2: Add extra documentation for register fields
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ea175ee26268370ca07aff91cf6ba1e0f1a3bd36
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:48:43 2010 +0100
rt2x00: Remove rt2x00lib_toggle_rx
As part of the queue refactoring, the rt2x00lib_toggle_rx
can be removed and replaced with the call directly to
the set_device_state callback function.
We can remove the STATE_RADIO_RX_ON_LINK and
STATE_RADIO_RX_OFF_LINK, as it was only used for
special behavior inside rt2x00lib rather then the
drivers.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8be4eed0ea7d8ef38692de878043a949e9db16e8
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:48:23 2010 +0100
rt2x00: Fix rt2x00queue_kick_tx_queue arguments
The queue_entry argument to rt2x00queue_kick_tx_queue,
doesn't make sense due to the function name (it is called
kick QUEUE)... But neither do we need the queue_entry, since
we need the data_queue.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 813f0339dd739c48607f12dac79ec26c61874226
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:48:05 2010 +0100
rt2x00: Rename queue->lock to queue->index_lock
The queue->lock is only used to protect the index
numbers. Rename the lock accordingly.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 821cde63b5bd04bc3ca0f95e2abf17b04e640488
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:47:46 2010 +0100
rt2x00: checkpatch.pl error fixes for rt73usb.c
rt73usb.c:43: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8bfbc31794635f6d0b7fd30950d49cecf54e1ce
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:47:25 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00queue.c
rt2x00queue.c:804: ERROR: space prohibited after that open parenthesis '('
rt2x00queue.c:805: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 027e8fd105c82956de9dec232bad21b1628ee7c0
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:47:09 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00link.c
rt2x00link.c:70: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5f181dc16bbd13b68b54ed5c43c4d2c5ad00297b
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:46:53 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00lib.h
rt2x00lib.h:60: ERROR: space prohibited after that open parenthesis '('
rt2x00lib.h:60: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c2361baec100c6f373107346e3fd98e9b267ac6c
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:46:36 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00dev.c
rt2x00dev.c:689: ERROR: spaces required around that '=' (ctx:WxV)
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8a239033c355be998b8985f12f0cc3a9eaeb93e9
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:46:17 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00config.c
rt2x00config.c:136: ERROR: space required before the open parenthesis '('
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 87a46caf920515eb269df0109f0a61a958236568
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:58 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800usb.h
rt2800usb.h:43: ERROR: space prohibited after that open parenthesis '('
rt2800usb.h:43: ERROR: space prohibited before that close parenthesis ')'
rt2800usb.h:44: ERROR: space prohibited after that open parenthesis '('
rt2800usb.h:44: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 144b80bc05e76df0acb8b5e86a6e6aaf0c53325e
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:41 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800usb.c
rt2800usb.c:48: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c6cbadeb3afd9471e539791842877d085f367746
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:22 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800pci.h
rt2800pci.h:41: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:42: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:43: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:44: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:55: ERROR: space prohibited after that open parenthesis '('
rt2800pci.h:55: ERROR: space prohibited before that close parenthesis ')'
rt2800pci.h:56: ERROR: space prohibited after that open parenthesis '('
rt2800pci.h:56: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bf1b15125e2aa245ddd9348f80d041d4f1fd13a9
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:06 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800lib.c
rt2800lib.c:831: ERROR: inline keyword should sit between storage class and type
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fd8dab9a67b22c35f38f0f5bfff4b3f6ed02e43a
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:52 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800.h
rt2800.h:1511: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1511: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1513: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1513: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1515: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1515: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1517: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1517: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1519: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1519: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1521: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1521: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1661: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1661: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1662: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1662: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1663: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:2013: ERROR: space prohibited after that open parenthesis '('
rt2800.h:2013: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:2014: ERROR: space prohibited after that open parenthesis '('
rt2800.h:2014: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cf553477a4dfb819c66ebfcad9f3b5cc3b93a9af
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:33 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2500usb.c
rt2500usb.c:42: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cb771b1a5de81e3ee59bd8b7ed17da6d09ffcf68
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:15 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2500pci.h
rt2500pci.h:1091: ERROR: space prohibited after that open parenthesis '('
rt2500pci.h:1091: ERROR: space prohibited before that close parenthesis ')'
rt2500pci.h:1092: ERROR: space prohibited after that open parenthesis '('
rt2500pci.h:1092: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 46b9786975a69a75f25b71796f7e36d203fbd4ee
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:00 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2400pci.h
rt2400pci.h:812: ERROR: space prohibited after that open parenthesis '('
rt2400pci.h:812: ERROR: space prohibited before that close parenthesis ')'
rt2400pci.h:813: ERROR: space prohibited after that open parenthesis '('
rt2400pci.h:813: ERROR: space prohibited before that close parenthesis ')'
rt2400pci.h:950: ERROR: Macros with complex values should be enclosed in parenthesis
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 041fb8f504fb0a6b61bc2131679da554b2fa8c9d
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Sat Nov 6 14:07:10 2010 +0100
carl9170: tx path review
This patch fixes a few shortcomings in the tx path.
* move temp. ampdu_[ack]_len out of txinfo->pad.
* fix WARN_ON from tx.c:line 300 when tx_ampdu_queue
fails to queue the frame.
* In tx_prepare, we already have a local pointer
to the station's ieee80211_sta struct.
* remove a second !sta check, tx_prepare already takes
care of that.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ffa56e540c3949c4560dcce45eca247819e183c1
Author: Jesper Juhl <jj(a)chaosbits.net>
Date: Thu Nov 4 22:59:56 2010 +0100
mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()
crypto_free_cipher() is a wrapper around crypto_free_tfm() which is a
wrapper around crypto_destroy_tfm() and the latter can handle being passed
a NULL pointer, so checking for NULL in the
ieee80211_aes_key_free()/ieee80211_aes_cmac_key_free() wrappers around
crypto_free_cipher() is pointless and just increase object code size
needlesly and makes us execute extra test/branch instructions that we
don't need.
Btw; don't we have to many wrappers around wrappers ad nauseam here?
Anyway, this patch removes the redundant conditionals.
Signed-off-by: Jesper Juhl <jj(a)chaosbits.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 723fc7af5300dba9eac40cb23dbefa67589e5181
Author: Lalith Suresh <suresh.lalith(a)gmail.com>
Date: Thu Nov 4 20:43:16 2010 +0100
rt2x00: Fix comments in rt73usb.h and rt61pci.h
This patch fixes a few comments in rt73usb.h and rt61pci.h.
Signed-off-by: Lalith Suresh <suresh.lalith(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fa8b4b22d543b4052602b0c86065150613ed19e8
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:42:36 2010 +0100
rt2x00: Fix hw crypto in AP mode for some devices
The BSSID register shouldn't be set in AP mode on some older devices (like
rt73usb) as it breaks hw crypto on these. However, rt2800 devices explicitly
need the BSSID register set to the same value as our own MAC address (only
in AP mode).
Hence, don't set the BSSID from rt2x00lib but move it down into rt2800 to
avoid problems on older devices.
This fixes a regression (at least for rt73usb) and avoids a new regression
for rt2800 devices in 2.6.36.
Reported-by: Johannes Stezenbach <js(a)sig21.net>
Reported-by: Lee <lee-in-berlin(a)web.de>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 070192dd2975c0e97bbdeac7623b755235c6db7d
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:41:05 2010 +0100
rt2x00: Fix crash on USB unplug
By not scheduling the TX/RX completion worker threads
when Radio is disabled, or hardware has been unplugged,
the queues cannot be completely cleaned.
This causes crashes when the hardware has been unplugged while
the radio is still enabled.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 303c7d6abfd0430e39e84a43361492b4a8c890b6
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:40:46 2010 +0100
rt2x00: Fix MCU_SLEEP arguments
Legacy driver uses 0xff as the second argument for the MCU_SLEEP
command. It is still unknown what the values actually mean, but
this will at least keep the command in-sync with the original
driver.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f44df18c58d4debe3ec0bb76a490aa2f3929fd8b
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:40:11 2010 +0100
rt2x00: Implement flush callback
Implement a basic flush callback function, which simply loops
over all TX queues and waits until all frames have been transmitted
and the status reports have been gathered.
At this moment we don't support dropping any frames during the
flush, but mac80211 will only send 'false' for this argument anyway,
so this is not important at this time.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aaf886bd215396f295bc0489e8ae09d1c03d9aa0
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Thu Nov 4 20:39:48 2010 +0100
rt2x00: Remove failsave from rt2x00usb_watchdog_tx_dma
When the TX status handler failed to clear the queue
in rt2x00usb_watchdog_tx_dma() we shouldn't use a failsave
to use the rt2x00usb txdone handler.
If a driver has overriden the txdone handler it must make
sure the txdone handler is capable of cleaning up the queue itself.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7225ce1ea93d24c0914eea0410dcfc426281f996
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:39:23 2010 +0100
rt2x00: Rename rt2x00queue_timeout
Rename rt2x00queue_timeout to rt2x00queue_status_timeout to
better describe what is actually timing out (note that
we already have a rt2x00queue_dma_timeout).
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e2f8c8752b994026fc0ddb4bb29ca229b3e0c104
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:38:56 2010 +0100
rt2x00: Optimize rt2x00debug_dump_frame when frame dumping is not active
When rt2x00 is compiled with debugging but frame dumping is currently
not active we can avoid the call to do_gettimeofday. Furthermore,
frame dumping is not the default case, mark it as unlikely.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2b23cdaa3b0e9567597563e5a7a5103ecda447f0
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:38:15 2010 +0100
rt2x00: Reduce tx descriptor size
The tx descriptor values qid, cw_min, cw_max and aifs are directly
accessible through the tx entry struct. So there's no need to copy
them into the tx descriptor and passing them to the indiviual drivers.
Instead we can just get the correct value from the tx entry.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 08e5310028359de2daaa39cd10e9ca493c51792b
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:37:47 2010 +0100
rt2x00: Wait up to one second on rt2800 for WPDMA to be ready
At least some devices need such a long time to inititalize WPDMA. This
only increases the maximum wait time and shouldn't affect devices that
have been working before.
Reported-by: Joshua Smith <jesmith(a)kaon.com>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit efd2f271e44c7ea011cdb0363d38f40338ab80d2
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:37:22 2010 +0100
rt2x00: Sync Tx and RX ring sizes with legacy drivers
All rt2x00 devices used the same Tx and Rx ring size (24 entries) till
now. Newer devices (like rt2800) can however make use of a larger TX and
RX ring due to 11n capabilities (AMPDUs of size 64 for example).
Hence, bring rt2x00 in sync with the legacy drivers and use the same TX
and RX ring sizes. Also remove the global defines RX_ENTRIES, TX_ENTRIES,
BEACON_ENTRIES and ATIM_ENTRIES and use per driver values.
That is 24 entries for rt2400pci, 32 entries for rt2500pci, rt2500usb,
rt61pci and rt73usb and 128 (RX) and 64 (TX) for rt2800pci and rt2800usb.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 961621abee08fde2328daf6f8000e1059e5205e9
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:36:59 2010 +0100
rt2x00: Add TXOP_CTRL_CFG register definition
Remove the magic value initialisation of the TXOP_CTRL_CFG register by
defining its fields and using them during intialisation. The field
RESERVED_TRUN_EN is referred to as reserved, however it is set to 1 by
the legacy drivers. Hence, do the same.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 066dae93bdfcc7af5e38a33617773fd5c6457607
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 7 14:59:39 2010 +0100
ath9k: rework tx queue selection and fix queue stopping/waking
The current ath9k tx queue handling code showed a few issues that could
lead to locking issues, tx stalls due to stopped queues, and maybe even
DMA issues.
The main source of these issues is that in some places the queue is
selected via skb queue mapping in places where this mapping may no
longer be valid. One such place is when data frames are transmitted via
the CAB queue (for powersave buffered frames). This is made even worse
by a lookup WMM AC values from the assigned tx queue (which is
undefined for the CAB queue).
This messed up the pending frame counting, which in turn caused issues
with queues getting stopped, but not woken again.
To fix these issues, this patch removes an unnecessary abstraction
separating a driver internal queue number from the skb queue number
(not to be confused with the hardware queue number).
It seems that this abstraction may have been necessary because of tx
queue preinitialization from the initvals. This patch avoids breakage
here by pushing the software <-> hardware queue mapping to the function
that assigns the tx queues and redefining the WMM AC definitions to
match the numbers used by mac80211 (also affects ath9k_htc).
To ensure consistency wrt. pending frame count tracking, these counters
are moved to the ath_txq struct, updated with the txq lock held, but
only where the tx queue selected by the skb queue map actually matches
the tx queue used by the driver for the frame.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Reported-by: Björn Smedman <bjorn.smedman(a)venatech.se>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 21e731a1b15bf03927e292af1b4a2c84fc8af817
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 3 21:36:12 2010 +0100
b43legacy: rfkill: use status register based on core revision (not PHY's)
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d94519c1b0de827d5d142b9333b7f114c0b3a021
Author: maximilian attems <max(a)stro.at>
Date: Tue Nov 2 23:39:12 2010 +0100
zd1201: Add missing id
The Mandriva patch seems to stem from 2.6.14, so much for their
upstreaming effort.
Didn't find another Linux reference of it, just an omnious
"USB\VID_1044&PID_8004" from GigabyteZD1201U.INF for
Gigabyte GN-WLBZ101 802.11b USB Adapter, which matches the
Mandriva patch comment.
Aboves file also lists an "USB\VID_1044&PID_8006", which I have
kept appart as this "Gigabyte GN-WBZB-M 802.11b USB Adapter"
didn't show up in googling.
Signed-off-by: maximilian attems <max(a)stro.at>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8cecc90e4a302ac214c48e362709ce906a96a295
Author: maximilian attems <max(a)stro.at>
Date: Tue Nov 2 23:10:12 2010 +0100
zd1211rw: add 2 missing usb id's
"These USB ID came from Palnex <http://www.planex.co.jp/>
Worked fine." says Mandriva patch for their 2.6.32 and earlier.
Web has evidence for both id's to work, so just add them upstream:
http://www.mail-archive.com/zd1211-devs@lists.sourceforge.net/msg00507.html
http://ubuntuforums.org/showthread.php?t=473046
Signed-off-by: Go Taniguchi <go(a)turbolinux.co.jp>
Signed-off-by: maximilian attems <max(a)stro.at>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit daeeb074105a80a34f90a454c24efc14e9a8d3c3
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:39 2010 -0200
rtl8187: restore anaparam registers after reset with 8187B
Current 8187B initialization misses anaparam registers restore after
8187 reset. This causes ANAPARAM register to stay zeroed out (ANAPARAM2
kept its value on my tests). To avoid this, call rtl8187_set_anaparam
right after chip reset (to be on the safe side, as it makes sure we
restore all ANAPARAM registers).
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Cc: seno <senada(a)t-online.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 998606cfd75e7a8169ed0d324061a8d6bc60716a
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:38 2010 -0200
rtl8187: remove uneeded setting of anaparam write
Usually you set RTL818X_CONFIG3_ANAPARAM_WRITE when you are going to
change/write ANAPARAM registers. But in current initialization of
RTL8187B there is a place where ANAPARAM_WRITE bit is set without any
ANAPARAM register being written, without reason, so remove it.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Cc: seno <senada(a)t-online.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0bf198eb4d05a4662143e4a2e2a44fb592e2b177
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:37 2010 -0200
rtl8187: consolidate anaparam on/off write sequences
There are repeated calls for anaparam on/off sequence in the code.
Consolidate the common code in rtl8187_set_anaparam and use it where
needed.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fe3326903d7aafd7b5602d8e178537c8b0465f6c
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:36 2010 -0200
rtl8187: don't set RTL818X_CONFIG3_GNT_SELECT flag on 8187B
The GNTSel bit should only concern pci devices by looking at RTL8180
spec, which is not the case of 8187B. Also testing shows that trying to
set this bit fails, a subsequent read from the register after trying to
set it shows that the bit isn't set, seems the hardware ignores it,
which makes sense. This setting was a left over from Realtek sources.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 896cae65fc0489b8e42bb7790f64731d53a2cecf
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:35 2010 -0200
rtl8187: move pll reset at start out of ANAPARAM write
On 8187B start, comment about pll reset, and move it out of ANAPARAM
write sequence, so that code is more readable.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a8ff34e37a186ebb7d2d90ee40ef88a3ef95ad47
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:34 2010 -0200
rtl8187: avoid redundant write to register FF72 (RFSW_CTRL)
The table with misc register initialization was setting it, and later
on we would set it again with a explicity call to rtl818x_iowrite16_idx.
Remove duplicate initialization from the register table.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 60f589145d76cf834ec5e485c5412ec0994e52d1
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:33 2010 -0200
rtl8187: fix wrong register initialization in 8187B
We were using wrong address for BRSR (Basic Rate Set Register) while
initializing its value, comparing with Realtek sources, for 8187B case.
Also, the same register is initialized in rtl8187b_reg_table, so remove
the duplicate initialization from the table.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f002c25cc13e86762551c0eda29a40c60d6dbf1b
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:32 2010 -0200
rtl8187: remove setting of beacon/atim registers from initialization
On 8187B path, we set a initial value for beacon interval and atim
window on initialization. But this isn't needed, since same setup is
done on rtl8187_config.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 327571ea9927beec2ee2ed9a266c57c1515393b4
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:31 2010 -0200
rtl8187: remove redundant initialization of ARFR
This removes redundant write to Auto Rate Fallback Register on RTL8187B.
The same value was being written twice in the same function. Avoid this
removing the duplicate initialization on rtl8187b_reg_table, and also
add comment for this write (information from Realtek source).
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6
Author: Nishant Sarmukadam <nishants(a)marvell.com>
Date: Mon Nov 1 17:55:48 2010 -0700
mwl8k: force AP mode to use non-AMPDU frames
AP firmware uses xmitcontrol to differentiate between AMPDU
and non-AMPDU frames. As the support for AMPDU is not yet
added, set xmitcontrol to non-AMPDU for all tx frames for AP
firmware. This field will be set to indicate ampdu/non-ampdu
frames when tx AMPDU support is added.
Signed-off-by: Pradeep Nemavat <pnemavat(a)marvell.com>
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Acked-by: Lennert Buytenhek <buytenh(a)wantstofly.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3eedb6f436858f3e864139dc184adc9a51440c92
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Sat Oct 30 00:36:53 2010 +0200
carl9170: configurable beacon rates
Previously, the beacon rate was fixed to either:
* 1Mb/s [2.4GHz band]
* 6Mb/s [5GHz band]
This limitation has been addressed and now the
beacon rate is selected by ieee80211_tx_info's
rate control info, almost like any ordinary
data frame.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2a6cef513fab525399e484edc9bfb39b6d462f76
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:41:16 2010 +0200
carl9170: stop stale uplink BA sessions
This patch fixes a possible lengthy stall if the device
is operating as an experimental 11n AP and an STA
[during heavy txrx action] suddenly signalized to go
off-channel (old NetworkManager), or (sleep - which is
unlikely, because then it wouldn't be *active* at all!?).
Because the driver has to manage the BA Window, the
sudden PSM transition can leave active uplink BA
sessions to the STA in a bad state and a proper
cleanup is needed.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e4a668c59080f862af3ecc28b359533027cbe434
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:26:13 2010 +0200
carl9170: fix spurious restart due to high latency
RX Stress tests of unidirectional bulk traffic with
bitrates of up to 220Mbit/s have revealed that the
fatal-event recovery logic [which was solely triggered
by an out-of-rx-buffer situation] is too aggressive.
The new method now "pings" the device and then
decides - based on the response - whenever
a restart is needed or not.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e27769059ccb15273a7eb69ed31b8e08f9b0eda8
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:17:38 2010 +0200
carl9170: initialize HW aMPDU parameters properly
This patch changes the initial aMPDU density and
factor settings to match those of Otus.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3f1240e4f4b249f2388903864bdc766973f76687
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 22:44:59 2010 +0200
carl9170: import hw/fw header updates
This patch imports all shared header changes
from carl9170fw.git.
* add some strategic __aligned(4).
This allows the compiler generate optimized code for
architectures which can't access (unaligned/packed)
data efficiently.
("ath9k_hw: optimize all descriptor access functions")
* add a forgotten __CARL9170FW__ ifdef around
a private firmware-internal struct.
* GET_VAL macro helper
Very useful for extracting data out of the
bit-packed PHY registers.
* cosmetic changes
e.g.: _CCA_MINCCA_ to just _CCA_MIN_.
* version bump 1.8.8.3 -> 1.9.0.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bdd7bd16439975133d36bcd7c9c489302a114525
Author: Blaise Gassend <blaise(a)willowgarage.com>
Date: Thu Oct 28 02:01:24 2010 -0700
mac80211_hwsim: Incorporate txpower into rssi
Up to now mac80211_hwsim has been reporting an rssi of -50. This patch
improves the model slightly by returning txpower-50. This makes it
easy to stimulate tests that need to see a varying rssi.
Signed-off-by: Blaise Gassend <blaise(a)willowgarage.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 19999792d2889350611ba9e346d6a2924959dc2d
Author: Thadeu Lima de Souza Cascardo <cascardo(a)holoscopio.com>
Date: Thu Oct 28 20:01:00 2010 -0200
rtl8187b: do not do per packet TX AGC
Clearing the per packet TX AGC for the RTL8187B device appears to
increase its overall TX power. This allows the device to associate and a
connection to be established using APs a little further away.
This is in accordance to what is done for RTL8187L devices and also what
Realtek drivers do.
Tested-by: Thadeu Lima de Souza Cascardo <cascardo(a)holoscopio.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo(a)holoscopio.com>
Cc: linux-wireless(a)vger.kernel.org
Cc: Larry Finger <Larry.Finger(a)lwfinger.net>
Cc: Rogerio Luz Coelho <rogluz.news(a)gmail.com>
Cc: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Cc: Hin-Tak Leung <hintak.leung(a)gmail.com>
Cc: seno <senada(a)t-online.de>
Tested-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e285a5250c0772c5596a9137041a96b2c1f744d6
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:09:58 2010 +0200
wl1271: add recover testmode command
add RECOVER testmode command.
this command triggers a recovery sequence (by enqueueing a recovery_work).
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit ccc83b046c03378bbaf7cf095d8d7e9b9abb24c5
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:09:57 2010 +0200
wl1271: handle HW watchdog interrupt
unmask the WL1271_ACX_INTR_WATCHDOG interrupt.
when getting it - enqueue a recovery work and bail out.
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 03107a4b5923aa7767329e857caf227749087e47
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:58:30 2010 +0200
wl1271: refactor debugfs function generation code
refactor wl1271_debugfs by using a format© function, instead of
duplicating the code for each generated function.
this change reduces about 3Kb from wl1271.ko
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 71125abdf0c297adc00dc5632f0318b2397286f5
Author: Eliad Peller <eliad(a)wizery.com>
Date: Thu Oct 28 21:46:43 2010 +0200
wl1271: set wl->vif only if add_interface succeeded.
set wl->vif to the newly created interface only after the firmware booted
successfully. on the way - make the function flow more clear.
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit f8d9802f66eda9ff14f7667f99a46b31e9a9e273
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Tue Oct 26 13:24:39 2010 +0200
wl1271: Check interface state in op_* functions
Check the state of the interface on op_* function so we don't try to access
the hardware in when its off.
The mac80211 may call these in some corner cases related, for instance, to
the hardware recovery procedure. These accesses cause a kernel crash on at
least some SDIO devices, because the bus is not properly claimed in that
scenario.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit b739a42c921dcb0ae92cc14032b7f75dcba88e3b
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Tue Oct 26 13:24:38 2010 +0200
wl1271: Fix scan failure detection
In scan_complete_work, because the mutex is released before accessing the
scan->failed flag, it is possible for unfounded hardware recovery rounds
to be executed.
Fix this.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Mon Oct 25 11:24:29 2010 +0200
wl1271: Fix RX path stall
The wl1271_rx function loops through packets in an aggregated buffer. Each
packet in the buffer is handled by a call to wl1271_rx_handle_data, which will
fail if skb memory allocation fails or production mode is enabled. These
failures currently prevent the rx counters to be incremented, thus causing the
rx loop to run forever.
Fix this by ignoring error codes reported wl1271_rx_handle_data function.
This essentially means that frames will be dropped in production mode, which
is the intetion, and frames will be dropped if memory allocation fails, which
is a decent way to recover from that situation.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit ff6d76fd3d45ed5494287e57d76073739721214b
Author: Nicolas Kaiser <nikai(a)nikai.net>
Date: Mon Oct 25 15:30:03 2010 +0200
wireless/wl1271: remove redundant if-statement v2
wl1271_ps_elp_sleep() is void and cannot return a value.
Signed-off-by: Nicolas Kaiser <nikai(a)nikai.net>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 5404643139c16e56d31a6ebd09cfa6db1eb03a36
Author: Luciano Coelho <luciano.coelho(a)nokia.com>
Date: Wed Oct 20 15:15:52 2010 +0300
wl1271: exit ELP mode when setting enabled rates in tx
This bug was being triggered by a call to acx_rate_policies in tx_work
without calling ps_elp_wakeup first. If we have full PSM enabled, this
happens rather often, immediately after association.
Reported-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
commit 6a2de93b2553c2e9a72997370534993c85c1eee6
Author: Teemu Paasikivi <ext-teemu.3.paasikivi(a)nokia.com>
Date: Thu Oct 14 11:00:04 2010 +0200
wl1271: Fix warning about unsupported RX rate
While scanning, it is possible that beacon and probe response frames are
received on other band than configured to the driver. In rx status
handling this has caused "Unsupported RX rate from HW" warnings. This
patch changes the wl1271_rate_to_index function to take the band of the
received frame as a parameter instead of using value configuret to
wl->band.
Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi(a)nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 18357850b694ba3fa29363c7d86ccd8783f4a065
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Wed Oct 13 16:09:41 2010 +0200
wl1271: 11n Support, functionality and configuration ability
Add 11n ability in scan, connection and using MCS rates.
The configuration is temporary due to the code incomplete and
still in testing process. That plans to be remove in the future.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit c4db1c879679e795689ef3c9dd7d3f6568ea14c5
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Wed Oct 13 16:09:40 2010 +0200
wl1271: 11n Support, ACX Commands
Added ACX command to the FW for 11n support.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit e8b03a2b8debc6056f6f43d24f98f601097301a1
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Wed Oct 13 16:09:39 2010 +0200
wl1271: 11n Support, Add Definitions
Two acx commands: ht_capabilities & ht_information, 11n sta capabilities
macro.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 2fe33e8cff354a3f320549544bffebbbab680145
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 14:49:12 2010 +0200
wl1271: Fix TX queue low watermark handling
The number of entries in the TX queue is compared to the low watermark
value each time TX completion interrupts are handled.
However, the fact that a TX completion arrived does not necessarily mean
there are any less skbs in the TX queue.
In addition, a TX completion interrupt does not necessarily mean that there
are any new available TX blocks. Thus, queuing TX work when the low
watermark is reached might not be needed.
Fix this by moving the low watermark handling to the TX work function,
and avoid queuing TX work in this case.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 25eeb9e3876a161e3afcc820c6cb72e13f9b7c7e
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 16:20:06 2010 +0200
wl1271: Allocate TX descriptors more efficiently
On each TX descriptor allocation, a free entry is found by traversing the TX
descriptors array.
Improve this by holding a bitmap of all TX descriptors, and using efficient
bit operations to search for free entries.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit a522550a283de31c7cfc30c7a129ce584e38c582
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 14:49:10 2010 +0200
wl1271: Fix TX starvation
While wl1271_irq_work handles RX directly (by calling wl1271_rx), a different
work is scheduled for transmitting packets. The IRQ work might handle more than
one interrupt during a single call, including multiple TX completion
interrupts. This might starve TX, since no packets are transmitted until all
interrupts are handled.
Fix this by calling the TX work function directly, instead of deferring
it.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 6c6e669ed6282788d6045397ce0f201edc400d9d
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 14:49:09 2010 +0200
wl1271: TX aggregation optimization
In case the aggregation buffer is too small to hold all available packets,
the buffer is transferred to the FW and no more packets are aggregated.
Although there may be enough available TX blocks, no additional packets will
be handled by the current TX work.
Fix this by flushing the aggregation buffer when it's full, and continue
transferring packets as long as there are enough available TX blocks.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit c8aea565e8f715d9f10064b1cbfbc15bf75df501
Author: Gery Kahn <geryk(a)ti.com>
Date: Tue Oct 5 16:09:05 2010 +0200
wl1271: ref_clock cosmetic changes
Cosmetic cleanup for ref_clock code while configured by board.
Signed-off-by: Gery Kahn <geryk(a)ti.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 34d59c07e9ad7130813c28f8554ef1298af923b7
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Sat Oct 23 09:15:46 2010 -0700
iwlagn: use 6000g2b uCode for 130 series devices
For 130 series device, 6000g2b uCode will be used, no need to
have additional defines for 130 devices, so remove those.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 69d826b6c54de113f02a73990b6f6809289b48cc
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Sat Oct 23 09:15:45 2010 -0700
iwlwifi: add new devices to Kconfig
Adding description to Kconfig to indicate more devices
are being supported by iwlagn
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f5682c01eb85fce13d064d232c947322bd7e2631
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Sat Oct 23 09:15:44 2010 -0700
iwlagn: turn dynamic smps on while BT is on
While BT is on and doing iscan and/or pscan, BT is in listen
mode which will impact WiFi throughput, we need to
enable dynamic smps in order to improve the rx throughput.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d4daaea656e0b5543c2e37c31934cea8f044b31e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:43 2010 -0700
iwlwifi: implement switching iftype while up
Implement switching the interface while an
interface is up in iwlwifi. Interfaces have
to stay on the context they were created on.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bd50a8ab9f48787109f6ff761c8f0e185e3d0690
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:42 2010 -0700
iwlwifi: fix IBSS beaconing
My previous patch to clean up all RXON handling
inadvertently broke IBSS because it failed to
take into account that unlike in AP mode, IBSS
requires beacons to be sent only after setting
the RXON assoc.
Fix this, clean up the code a bit, improve the
error checking around this, and also react to
beacon changes in IBSS mode from mac80211.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2295c66b68ae160dde2e6e2dc4f3061105153bfc
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:41 2010 -0700
iwlagn: new RXON processing for modern devices
In order to simplify the flow, and make new
enhancements easier, separate out the RXON
processing for modern AGN (5000 and newer)
from RXON processing for the older 3945 and
4965 devices. Avoid changing these old ones
to avoid regressions and move their code to
a new file (iwl-legacy.c). 4965 gets the
commit_rxon that used to be common for all
AGN devices, but with removed PAN support.
The new RXON processing is more central and
does more work in committing, so that it is
easier to follow.
To make it more evident what is split out
for legacy, split the necessary operations
for that into a new struct iwl_legacy_ops.
Those parts that still exist in the new AGN
code don't need to be parametrized.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d4e43c3c6783f956163c11568303b0390725e28
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:40 2010 -0700
iwlagn: don't resend RXON timing
Resending RXON timing here caused issues with
dual-mode under certain circumstances, so avoid
doing it here right now.
This effectively reverts b01efe434bd6ea807eb72b
and partially 2491fa42d9bdf26075765. The next
patch will make all this cleaner for just the
devices that need it.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dc21b5453249e7e9b8878fab356fd60b731cf04d
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:39 2010 -0700
iwlwifi: make mac80211 ops a device config
In the future, 4965 and modern AGN devices will
need to have different mac80211 callbacks since
they have different capabilities. Prepare for
that by making the mac80211 operations a device
config.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 07caf9d6c9135ae25a760867f37aab90c1008380
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:58:29 2010 +0200
mac80211: refactor debugfs function generation code
refactor mac80211 debugfs code by using a format© function, instead of
duplicating the code for each generated function.
this change reduces about 600B from mac80211.ko
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6a6733f256f18cbcf4875e13f59eedb593b755a8
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Oct 26 15:27:25 2010 -0700
ath9k: content DMA start / stop through the PCU lock
This helps align resets / RX enable & disable / TX stop / start.
Locking around the PCU is important to ensure the hardware doesn't
get stale data when working with DMA'able data.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4bdd1e978ede034c1211957eb17eaf50de00d234
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Oct 26 15:27:24 2010 -0700
ath9k: move the PCU lock to the sc structure
The PCU lock should be used to contend TX DMA as well,
this will be done next.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9d94674ab754be0e275120a183670ead435f9c0d
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Oct 26 15:27:23 2010 -0700
ath9k: simplify hw reset locking
The new PCU lock is better placed so we can just contend
against that when trying to reset hardware.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5d4c428254f73bae272be9d296724b1ee09d76ec
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Oct 26 21:28:57 2010 +0530
ath9k: Properly assign boolean types
This takes care that boolean types are properly assigned
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Tue Oct 26 20:11:29 2010 +0530
ath9k_htc: Handle monitor mode properly for HTC devices
No need to inform about monitor interface changes to
firmware. Set the HW mode to monitor type based on mac80211
indication flag is sufficient.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f60dc0138aa19769bf8bab9f93b043235428b66f
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Oct 25 16:12:37 2010 -0400
iwlwifi: Convert to new PCI PM framework
Use the new PCI PM and let the PCI core code handle the PCI-specific
details of power transitions.
Based on similarly titled ath9k patch posted by Rafael J. Wysocki.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
Acked-by: Rafael J. Wysocki <rjw(a)sisk.pl>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit b9237578f8d685bb86901ba9ff0d379218e5a3c5
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Oct 25 10:33:07 2010 -0400
rt2x00pci: do not use GFP_DMA
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
Acked-by: Ivo van Doorn <IvDoorn(a)gmail.com>
commit 26f94dc264a7ebddcc08d3908e99880703d871e5
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Oct 25 10:24:09 2010 -0400
b43: remove extraneous code in free_ringmemory
This code seems to have been cut-n-pasted from alloc_ringmemory?
Anyway, it is useless.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8e7ce8930165c785ec1c754ef3e3092a3bdffe02
Author: Hauke Mehrtens <hauke(a)hauke-m.de>
Date: Sat Oct 23 19:51:32 2010 +0200
carl9170: fix typos
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Acked-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a2d9bc6fdc0c8693b5641c69bce7eaf5b47f0593
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:49 2010 +0200
b43: N-PHY: improve 2055 radio initialization
1) Upload 5 GHz values when needed.
2) Do not upload all values on first init. Follow wl.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:48 2010 +0200
b43: N-PHY: determine usage of radio regulatory workaround correctly
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7e6da2bfc05c2b96197c12484f3d071fe0c6d0fb
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:47 2010 +0200
b43: define known SPROM boardflags2 bits
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c0b102c20972cfa3e10a0cf4a2a563edb70961b1
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:46 2010 +0200
b43: N-PHY: fix 2055 radio init
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3eb9616af24d6a1910ae6ae5c2d51719eba960cf
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:30 2010 +0200
iwlwifi: avoid commit rxon during scan in iwl_set_no_assoc
Currently we are canceling scan when changing BSSID. Behave the same
when changing association and beacon enablement, to avoid committing
rxon during scan in iwl_set_no_assoc().
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ac4f5457c7617999967e9740f8903b922714bab4
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:29 2010 +0200
iwlwifi: defer update power mode while scan
Do not set power mode when scanning, and defer that when scan finish.
We still set power mode in force case i.e. when device is overheated.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5eda74a40587139b1d66cd8197cac92ba36e79f4
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:28 2010 +0200
iwlwifi: avoid commit rxon during scan in iwlagn_bt_traffic_change_work
Avoid sending commands to firmware (including commit_rxon) when scan
is pending and we are calling iwlagn_bt_traffic_change_work simultaneously.
Also comment some innocent race conditions.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 749ff4efa14df904c22b28e2f7b10a02119a4d5e
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:27 2010 +0200
iwlwifi: avoid commit rxon during scan in iwlagn_configure_filter
Almost anywhere in the code we avoid committing rxon while performing
scan, and make rxon commit when scan complete. However in some places
in the code we do not follow that rule. This patch fix that problem in
iwlagn_configure_filter().
Since we do not commit directly in iwl3945_configure_filter, we can
also do the same for agn, so I just remove iwlcore_commit_rxon()
function and add a comment. Also change comment for iwl3945.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a25a66ac94db88190653d5725c563e3f8faeee61
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:26 2010 +0200
iwlwifi: fix set_tx_power vs scan
According to comment in iwl_bg_scan_completed, setting tx power should
be deferred during pending scan, but we are not doing this.
This patch change code to really defer setting tx power after scan
complete. Additionally refactor iwl_set_tx_power code and call
lib->send_tx_power() directly from iwlagn_commit_rxon.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4cbf1b12491cd43032846acc6c6924d9090fa19f
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:25 2010 +0200
iwlwifi: send tx_power_cmd synchronously
On 5xxx and 6xxx change to send tx_power_cmd command synchronously,
to do not start other commands when setting tx power is pending.
We currently do the same for 4956 and 3945.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4beeba7dc59cc10d6a47346c857d1a64a9ec9642
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Mon Oct 25 10:34:50 2010 +0200
iwlwifi: warn when send tx power settings during scan
Add WARN_ONCE when scanning is pending. Use STATUS_SCAN_HW bit since we
can have scan canceled or completed but STATUS_SCANNING bit still set.
v1 -> v2: replace EIO to EAGAIN
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c7317e41df30c7e04dca46360e5ebb0cb36dda45
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Oct 21 02:47:25 2010 +0200
mac80211: minstrel_ht - reduce the overhead of rate sampling
- reduce the number of retransmission attempts for sample rates
- sample lower rates less often
- do not use RTS/CTS for sampling frames
- increase the time between sampling attempts
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff32d9cd2c4107224a28f39d3c72eec66d566e09
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Oct 21 02:47:23 2010 +0200
ath9k_hw: fix potential spurious tx error bit interpretation
According to documentation, AR_ExcessiveRetries, AR_Filtered and
AR_FIFOUnderrun are only valid if AR_FrmXmitOK is clear.
Not checking this might result in suboptimal FIFO settings, unnecessary
retransmissions, or other connectivity issues.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Cc: stable(a)kernel.org
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 78a7685e1e44c6d4b6f79c73687b9322e40b040e
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 16:07:08 2010 -0700
ath9k: add a debug warning when we cannot stop RX
We have seen several DMA races when we race against
stopping and starting the PCU. I suspect that when
we cannot stop the PCU we may hit some of these same
races so warn against them for now but only when
debugging (CONFIG_ATH_DEBUG) is enabled.
If you run into this warning and are a developer,
please fix the cause of the warning. The potential
here, although I cannot prove yet, is that the DMA
engine can be confused and start writing to a buffer
that was already DMA'd before and at least the kernel
assumes is not being accessed by hardware anymore.
Cc: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b87b0128894efd3bbf7272a579f71b3a2bc500d1
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Thu Oct 21 12:10:11 2010 -0700
ath: add a ATH_DBG_WARN()
To be used to throw out warnings only for developers.
This can be used by some corner cases that developers
already know can be hit but developers want to address
so to avoid spewing out a warning this can only be
enabled with CONFIG_ATH_DEBUG enabled.
Cc: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d91e41b690f795c04af4eb6fe28d2cafd3291051
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:59 2010 -0700
cfg80211: prefix REG_DBG_PRINT() with cfg80211
Everyone's doing it, its the cool thing.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e702d3cf29143327679ce2e2a60775eaf829f377
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Thu Oct 21 19:17:04 2010 +0530
cfg80211: add debug print when processing a channel
In the worst case you are seeing really odd things you want
more information than what is provided right now, for those
that insist and want debug info through CONFIG_CFG80211_REG_DEBUG
provide a print of when we are processing a channel and with what
regulatory rule.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a65185367f9f876448f0f12ac09a673d20371efc
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:57 2010 -0700
cfg80211: add debug print when disabling a channel on a custom regd
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 926a0a094d2b9052db3f7f37438c3d305cea4be7
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Thu Oct 21 19:17:03 2010 +0530
cfg80211: add debug prints for when we ignore regulatory hints
This can help with debugging issues. You will only see
these with CONFIG_CFG80211_REG_DEBUG enabled.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ca4ffe8f2848169a8ded0ea8a60b2d81925564c9
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:55 2010 -0700
cfg80211: fix disabling channels based on hints
After a module loads you will have loaded the world roaming regulatory
domain or a custom regulatory domain. Further regulatory hints are
welcomed and should be respected unless the regulatory hint is coming
from a country IE as the IEEE spec allows for a country IE to be a subset
of what is allowed by the local regulatory agencies.
So disable all channels that do not fit a regulatory domain sent
from a unless the hint is from a country IE and the country IE had
no information about the band we are currently processing.
This fixes a few regulatory issues, for example for drivers that depend
on CRDA and had no 5 GHz freqencies allowed were not properly disabling
5 GHz at all, furthermore it also allows users to restrict devices
further as was intended.
If you recieve a country IE upon association we will also disable the
channels that are not allowed if the country IE had at least one
channel on the respective band we are procesing.
This was the original intention behind this design but it was
completely overlooked...
Cc: David Quan <david.quan(a)atheros.com>
Cc: Jouni Malinen <jouni.malinen(a)atheros.com>
cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 749b527b21465fb079796c03ffb4302584dc31c1
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:54 2010 -0700
cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY
even if we haven't yet recieved regulatory domain hint for the driver
if it needed one. Without this Country IEs are not passed on to drivers
that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all
Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170.
This was part of the original design, however it was completely
overlooked...
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:53 2010 -0700
cfg80211: pass the reg hint initiator to helpers
This is required later.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Cc: stable(a)kernel.org
signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68
Author: Stephen Hemminger <shemminger(a)vyatta.com>
Date: Wed Oct 20 10:16:58 2010 -0700
rfkill: remove dead code
The following code is defined but never used.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e081685c1bbe8da37c7f61726fdb783ff277f14f
Author: Larry Finger <Larry.Finger(a)lwfinger.net>
Date: Wed Oct 20 09:59:33 2010 -0500
ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices
MMIO log traces obtained using the Broadcom wl hybrid driver show that
the RETRY_TIMEOUT register (0x41) in PCI configuration space is cleared
if non-zero. Similar code found in other drivers such as ipw2100 show
this operation is needed to keep PCI Tx retries from interfering with
C3 CPU state. There are no known cases where omission of this code has
caused a problem, but this patch is offered just in case such a situation
occurs.
Signed-off-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 14fb7c17e97ea0fcc545393fb1f34e6541647b5b
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 06:59:38 2010 -0700
ath5k: make ath5k_update_bssid_mask_and_opmode() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/base.c:569:6: warning: symbol
'ath5k_update_bssid_mask_and_opmode' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8c2a0871b8462481a02445b38a7321ad63bfc88
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 06:59:37 2010 -0700
ath: make ath_hw_set_keycache_entry() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/key.c
drivers/net/wireless/ath/key.c:110:6: warning: symbol
'ath_hw_set_keycache_entry' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a3685d119dacb07a7080169fea2847ef385b209f
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 06:59:36 2010 -0700
ath: make ath_hw_keysetmac() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/key.c
drivers/net/wireless/ath/key.c:70:6: warning: symbol 'ath_hw_keysetmac' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit babcbc295fee766ca710235e431686fef744d9a6
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Oct 20 02:09:46 2010 +0200
ath9k: initialize per-channel tx power limits instead of hardcoding them
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit de40f316c01b1ba9535e6dc99f6a67e7655b07da
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Oct 20 03:08:53 2010 +0200
ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower
ath9k_hw_set_txpowerlimit gets an extra boolean parameter that - if set -
causes the rate txpower table and the regulatory limit to be calculated
and stored, without changing hardware registers.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6b7b6cf553f881d45bb37a73f5db956afb290a08
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Oct 20 02:09:44 2010 +0200
ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003
The same is done for the older chip families as well.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 900fcf091e95fbcc773b72c770afcd2e8eda4da2
Author: Paul Mundt <lethal(a)linux-sh.org>
Date: Mon Nov 1 09:29:24 2010 +0000
net: sh_eth: Move off of deprecated I/O routines.
sh_eth is the last in-tree user of the ctrl_xxx I/O routines. This simply
converts them over to regular MMIO accesors.
Signed-off-by: Paul Mundt <lethal(a)linux-sh.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 636e19a34275d7d6fda0fefa965b1e2a715e2b02
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Sat Oct 30 14:22:42 2010 +0000
net: consolidate 8021q tagging
Now that VLAN packets are tagged in dev_hard_start_xmit()
at the bottom of the stack we no longer need to tag them
in the 8021Q module (Except in the !VLAN_FLAG_REORDER_HDR
case).
This allows the accel path and non accel paths to be consolidated.
Here the vlan_tci in the skb is always set and we allow the
stack to add the actual tag in dev_hard_start_xmit().
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Sat Oct 30 14:22:37 2010 +0000
net: remove check for headroom in vlan_dev_create
It is possible for the headroom to be smaller then the
hard_header_len for a short period of time after toggling
the vlan offload setting.
This is not a hard error and skb_cow_head is called in
__vlan_put_tag() to resolve this.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 029f5fc31cdb35d6c8a7fe9a54bf21556e175988
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Sat Oct 30 14:22:32 2010 +0000
8021q: set hard_header_len when VLAN offload features are toggled
Toggling the vlan tx|rx hw offloads needs to set the hard_header_len
as well otherwise we end up using LL_RESERVED_SPACE incorrectly.
This results in pskb_expand_head() being used unnecessarily.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 58e998c6d23988490162cef0784b19ea274d90bb
Author: Jesse Gross <jesse(a)nicira.com>
Date: Fri Oct 29 12:14:55 2010 +0000
offloading: Force software GSO for multiple vlan tags.
We currently use vlan_features to check for TSO support if there is
a vlan tag. However, it's quite likely that the NIC is not able to
do TSO when there is an arbitrary number of tags. Therefore if there
is more than one tag (in-band or out-of-band), fall back to software
emulation.
Signed-off-by: Jesse Gross <jesse(a)nicira.com>
CC: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c8d5bcd1aff89199cde4bd82c5c40fb704c8bba4
Author: Jesse Gross <jesse(a)nicira.com>
Date: Fri Oct 29 12:14:54 2010 +0000
offloading: Support multiple vlan tags in GSO.
We assume that hardware TSO can't support multiple levels of vlan tags
but we allow it to be done. Therefore, enable GSO to parse these tags
so we can fallback to software.
Signed-off-by: Jesse Gross <jesse(a)nicira.com>
CC: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1e78db628b33c657944865e3bca01ee59cc5b80
Author: Jesse Gross <jesse(a)nicira.com>
Date: Fri Oct 29 12:14:53 2010 +0000
offloading: Make scatter/gather more tolerant of vlans.
When checking if it is necessary to linearize a packet, we currently
use vlan_features if the packet contains either an in-band or out-
of-band vlan tag. However, in-band tags aren't special in any way
for scatter/gather since they are part of the packet buffer and are
simply more data to DMA. Therefore, only use vlan_features for out-
of-band tags, which could potentially have some interaction with
scatter/gather.
Signed-off-by: Jesse Gross <jesse(a)nicira.com>
CC: Ben Hutchings <bhutchings(a)solarflare.com>
Reviewed-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 410989f65151557701ce86875b141e694281dd6c
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:43 2010 +0000
cxgb4vf: Advertise NETIF_F_TSO_ECN.
Advertise NETIF_F_TSO_ECN.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4204875dd4b3c3e40e0294a8c2619fdf9e5907e1
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:42 2010 +0000
cxgb4vf: fix up "Section Mismatch" compiler warning.
Fix up "Section Mismatch" compiler warning and mark another routine as
__devinit.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f12fe3536bebcbd2ccfa80030ec7d9868c488d30
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:41 2010 +0000
cxgb4vf: add ethtool statistics for GRO.
Add ethtool statistics for GRO.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit caedda35c6dba5a283e5d87e77a8d19ee4be3183
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:40 2010 +0000
cxgb4vf: minor comment/symbolic name cleanup.
Minor cleanup of comments and symbolic constant names for clarity.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d9aa93804e53f2153260568024b75ad3d81784f9
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 08:52:02 2010 -0800
ipv4: Fix build with multicast disabled.
net/ipv4/igmp.c: In function 'ip_mc_inc_group':
net/ipv4/igmp.c:1228: error: implicit declaration of function 'for_each_pmc_rtnl'
net/ipv4/igmp.c:1228: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_unmap':
net/ipv4/igmp.c:1333: error: expected ';' before 'igmp_group_dropped'
...
Move for_each_pmc_rcu and for_each_pmc_rtnl macro definitions
outside of multicast ifdef protection.
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7e87fe84303cc54ecf3c7b688cb08ca24322a41d
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:26:13 2010 +0100
dccp ccid-2: Separate option parsing from CCID processing
This patch replaces an almost identical replication of code: large parts
of dccp_parse_options() re-appeared as ccid2_ackvector() in ccid2.c.
Apart from the duplication, this caused two more problems:
1. CCIDs should not need to be concerned with parsing header options;
2. one can not assume that Ack Vectors appear as a contiguous area within an
skb, it is legal to insert other options and/or padding in between. The
current code would throw an error and stop reading in such a case.
Since Ack Vectors provide CCID-specific information, they are now processed
by the CCID directly, separating this functionality from the main DCCP code.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 52394eecec4e6fa677a61af26f0bd35de665344e
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:26:02 2010 +0100
dccp ccid-2: Remove old infrastructure
This removes
* functions for which updates have been provided in the preceding patches and
* the @av_vec_len field - it is no longer necessary since the buffer length is
now always computed dynamically.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit d83447f0944e73d690218d79c07762ffa4ceb9e4
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:46 2010 +0100
dccp ccid-2: Schedule Sync as out-of-band mechanism
The problem with Ack Vectors is that
i) their length is variable and can in principle grow quite large,
ii) it is hard to predict exactly how large they will be.
Due to the second point it seems not a good idea to reduce the MPS; in
particular when on average there is enough room for the Ack Vector and an
increase in length is momentarily due to some burst loss, after which the
Ack Vector returns to its normal/average length.
The solution taken by this patch is to subtract a minimum-expected Ack Vector
length from the MPS, and to defer any larger Ack Vectors onto a separate
Sync - but only if indeed there is no space left on the skb.
This patch provides the infrastructure to schedule Sync-packets for transporting
(urgent) out-of-band data. Its signalling is quicker than scheduling an Ack, since
it does not need to wait for new application data.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 18219463c884bfdb7954d298b9edb5194b14d621
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:36 2010 +0100
dccp ccid-2: Consolidate Ack-Vector processing within main DCCP module
This aggregates Ack Vector processing (handling input and clearing old state)
into one function, for the following reasons and benefits:
* all Ack Vector-specific processing is now in one place;
* duplicated code is removed;
* ensuring sanity: from an Ack Vector point of view, it is better to clear the
old state first before entering new state;
* Ack Event handling happens mostly within the CCIDs, not the main DCCP module.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 3802408644515e29fb723d51a5317301b212cf3a
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:23 2010 +0100
dccp ccid-2: Update code for the Ack Vector input/registration routine
This patch updates the code which registers new packets as received, using the
new circular buffer interface. It contributes a new algorithm which
* supports both tail/head pointers and buffer wrap-around and
* deals with overflow (head/tail move in lock-step).
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:11 2010 +0100
dccp ccid-2: Algorithm to update buffer state
This provides a routine to consistently update the buffer state when the
peer acknowledges receipt of Ack Vectors; updating state in the list of Ack
Vectors as well as in the circular buffer.
While based on RFC 4340, several additional (and necessary) precautions were
added to protect the consistency of the buffer state. These additions are
essential, since analysis and experience showed that the basic algorithm was
insufficient for this task (which lead to problems that were hard to debug).
The algorithm now
* deals with HC-sender acknowledging to HC-receiver and vice versa,
* keeps track of the last unacknowledged but received seqno in tail_ackno,
* has special cases to reset the overflow condition when appropriate,
* is protected against receiving older information (would mess up buffer state).
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit c25ecd0a21d5e08160cb5cc984f9e2b8ee347443
Merge: 190683a 9457b24
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Nov 14 11:57:05 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 190683a9d5457e6d962c232ffbecac3ab158dddd
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 10 10:50:44 2010 +0000
net: net_families __rcu annotations
Use modern RCU API / annotations for net_families array.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e85eb11782259dc39502807f3ec903a7b82b1bab
Author: Philippe De Muyter <phdm(a)macqel.be>
Date: Thu Nov 11 12:31:21 2010 +0000
net: Kconfig whitespace cleanup
Many lines in Kconfig start withe 8 spaces instead of a TAB, and even
sometimes with 7 spaces. Replace 10 or 9 spaces, or TAB + 1 space,
by TAB + 2 spaces, and 8 or 7 spaces by TAB.
Signed-off-by: Philippe De Muyter <phdm(a)macqel.be>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d7138de878d1d4210727c1200193e69596f93b3
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Nov 12 05:46:50 2010 +0000
igmp: RCU conversion of in_dev->mc_list
in_dev->mc_list is protected by one rwlock (in_dev->mc_list_lock).
This can easily be converted to a RCU protection.
Writers hold RTNL, so mc_list_lock is removed, not replaced by a
spinlock.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Cypher Wu <cypher.w(a)gmail.com>
Cc: Américo Wang <xiyou.wangcong(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f5539b5bfa2e00f2a6fd35731db66142a2f327c0
Author: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Date: Fri Nov 12 12:43:34 2010 -0800
stmmac: update the driver documentation
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c753796769e4fb0cd813b6e5801b3c01f4681d4f
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Nov 11 17:07:48 2010 -0800
ipv4: Make rt->fl.iif tests lest obscure.
When we test rt->fl.iif against zero, we're seeing if it's
an output or an input route.
Make that explicit with some helper functions.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ed1deb7021b4dfee1d544b91edff4ef92f5c3b54
Merge: 72cdd1d b3d14bf
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Nov 11 10:43:30 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit 72cdd1d971c0deb1619c5c339270570c43647a78
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 11 07:14:07 2010 +0000
net: get rid of rtable->idev
It seems idev field in struct rtable has no special purpose, but adding
extra atomic ops.
We hold refcounts on the device itself (using percpu data, so pretty
cheap in current kernel).
infiniband case is solved using dst.dev instead of idev->dev
Removal of this field means routing without route cache is now using
shared data, percpu data, and only potential contention is a pair of
atomic ops on struct neighbour per forwarded packet.
About 5% speedup on routing test.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Herbert Xu <herbert(a)gondor.apana.org.au>
Cc: Roland Dreier <rolandd(a)cisco.com>
Cc: Sean Hefty <sean.hefty(a)intel.com>
Cc: Hal Rosenstock <hal.rosenstock(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 46b13fc5c0f239f36e84665c73087d5fa86bfd86
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 11 06:57:19 2010 +0000
neigh: reorder struct neighbour
It is important to move nud_state outside of the often modified cache
line (because of refcnt), to reduce false sharing in neigh_event_send()
This is a followup of commit 0ed8ddf4045f (neigh: Protect neigh->ha[]
with a seqlock)
This gives a 7% speedup on routing test with IP route cache disabled.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c0c04c2a89cf6363da2940da59afd2e30001b991
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:04 2010 +0000
vxge: update driver version
Update vxge driver version
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2c91308f449c6705b81bd3370a0ec647e370f35c
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:03 2010 +0000
vxge: sparse and other clean-ups
Correct issues found by running sparse on the vxge driver, as well as
other miscellaneous cleanups.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1901d042abf10d08a829961a63fd158f9844587e
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:02 2010 +0000
vxge: update Kconfig
Update Kconfig to reflect Exar's purchase of Neterion (formerly S2IO).
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca3e3b8fae982400dacbbf19f3112cc84e51d46a
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:01 2010 +0000
vxge: correct multi-function detection
The values used to determined if the adapter is running in single or
multi-function mode were previously modified to the values necessary
when making the VXGE_HW_FW_API_GET_FUNC_MODE firmware call. However,
the firmware call was not modified. This had the driver printing out on
probe that the adapter was in multi-function mode when in single
function mode and vice versa.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e7935c9669c27c5d530bff634c0c15f7a602d697
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:00 2010 +0000
vxge: Titan1A detection
Detect if the adapter is Titan or Titan1A, and tune the driver for this
hardware. Also, remove unnecessary function __vxge_hw_device_id_get.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c3150eac9f2e5f770b09d371f7716540219a46f6
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:59 2010 +0000
vxge: Handle errors in vxge_hw_vpath_fw_api
Propagate the return code of the call to vxge_hw_vpath_fw_api and
__vxge_hw_vpath_pci_func_mode_get. This enables the proper handling of
error conditions when querying the function mode of the device during
probe.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b81b37338412e3215670641e5025c85146521dea
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:58 2010 +0000
vxge: add receive hardware timestamping
Add support for enable/disabling hardware timestamping on receive
packets via ioctl call. When enabled, the hardware timestamp replaces
the FCS in the payload.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e8ac175615b9458a00193c55617b5b8865e67817
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:57 2010 +0000
vxge: add support for ethtool firmware flashing
Add the ability in the vxge driver to flash firmware via ethtool.
Updated to include comments from Ben Hutchings.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8424e00dfd5282026a93996a165fc4079d382169
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:56 2010 +0000
vxge: serialize access to steering control register
It is possible for multiple callers to access the firmware interface for
the same vpath simultaneously, resulting in uncertain output. Add locks
to serialize access. Also, make functions only accessed locally static,
thus requiring some movement of code blocks.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ddd62726e0bc1ffe0ab791b647f4178161ab451b
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:55 2010 +0000
vxge: cleanup debug printing and asserts
Remove all of the unnecessary debug printk indirection and temporary
variables for vxge_debug_ll and vxge_assert.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4d2a5b406c02b224bd3f50992c8b02450c65a730
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:54 2010 +0000
vxge: Wait for Rx to become idle before reseting or closing
Wait for the receive traffic to become idle before attempting to close
or reset the adapter. To enable the processing of packets while Receive
Idle, move the clearing of __VXGE_STATE_CARD_UP bit in vxge_close to
after it. Also, modify the return value of the ISR when the adapter is
down to IRQ_HANDLED. Otherwise there are unhandled interrupts for the
device.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 47f01db44b2470d9517848f6b73c75883ef5fda0
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:53 2010 +0000
vxge: enable rxhash
Enable RSS hashing and add ability to pass up the adapter calculated rx
hash up the network stack (if feature is available). Add the ability to
enable/disable feature via ethtool, which requires that the adapter is
not running at the time. Other miscellaneous cleanups and fixes
required to get RSS working.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b3d14bff12a38ad13a174eb0cc83d2ac7169eee4
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Wed Nov 10 21:21:35 2010 +0100
dccp ccid-2: Implementation of circular Ack Vector buffer with overflow handling
This completes the implementation of a circular buffer for Ack Vectors, by
extending the current (linear array-based) implementation. The changes are:
(a) An `overflow' flag to deal with the case of overflow. As before, dynamic
growth of the buffer will not be supported; but code will be added to deal
robustly with overflowing Ack Vector buffers.
(b) A `tail_seqno' field. When naively implementing the algorithm of Appendix A
in RFC 4340, problems arise whenever subsequent Ack Vector records overlap,
which can bring the entire run length calculation completely out of synch.
(This is documented on http://www.erg.abdn.ac.uk/users/gerrit/dccp/notes/\
ack_vectors/tracking_tail_ackno/ .)
(c) The buffer length is now computed dynamically (i.e. current fill level),
as the span between head to tail.
As a result, dccp_ackvec_pending() is now simpler - the #ifdef is no longer
necessary since buf_empty is always true when IP_DCCP_ACKVEC is not configured.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 7d870936602533836bba821bd5c679c62c52a95f
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Wed Nov 10 21:21:02 2010 +0100
dccp ccid-2: Separate internals of Ack Vectors from option-parsing code
This patch
* separates Ack Vector housekeeping code from option-insertion code;
* shifts option-specific code from ackvec.c into options.c;
* introduces a dedicated routine to take care of the Ack Vector records;
* simplifies the dccp_ackvec_insert_avr() routine: the BUG_ON was redundant,
since the list is automatically arranged in descending order of ack_seqno.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit f17a37c9b8c4b32c01e501a84fa6f30e344c6110
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Wed Nov 10 21:20:07 2010 +0100
dccp ccid-2: Ack Vector interface clean-up
This patch brings the Ack Vector interface up to date. Its main purpose is
to lay the basis for the subsequent patches of this set, which will use the
new data structure fields and routines.
There are no real algorithmic changes, rather an adaptation:
(1) Replaced the static Ack Vector size (2) with a #define so that it can
be adapted (with low loss / Ack Ratio, a value of 1 works, so 2 seems
to be sufficient for the moment) and added a solution so that computing
the ECN nonce will continue to work - even with larger Ack Vectors.
(2) Replaced the #defines for Ack Vector states with a complete enum.
(3) Replaced #defines to compute Ack Vector length and state with general
purpose routines (inlines), and updated code to use these.
(4) Added a `tail' field (conversion to circular buffer in subsequent patch).
(5) Updated the (outdated) documentation for Ack Vector struct.
(6) All sequence number containers now trimmed to 48 bits.
(7) Removal of unused bits:
* removed dccpav_ack_nonce from struct dccp_ackvec, since this is already
redundantly stored in the `dccpavr_ack_nonce' (of Ack Vector record);
* removed Elapsed Time for Ack Vectors (it was nowhere used);
* replaced semantics of dccpavr_sent_len with dccpavr_ack_runlen, since
the code needs to be able to remember the old run length;
* reduced the de-/allocation routines (redundant / duplicate tests).
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 0c6202b3278b417444a59cecc59e6e5af04db7fd
Author: Ron Mercer <ron.mercer(a)qlogic.com>
Date: Wed Nov 10 09:29:46 2010 +0000
qlge: Version change to v1.00.00.27
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria(a)qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 673483c7d3a25c43d1208bb07e3888bc5136e8cf
Author: Ron Mercer <ron.mercer(a)qlogic.com>
Date: Wed Nov 10 09:29:45 2010 +0000
qlge: Add firmware info to ethtool get regs.
By default we add firmware information to ethtool get regs.
Optionally firmware info can instead be sent to log.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria(a)qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit edb40a23c8dc5b5be219bf4561074b6233bba65f
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Oct 19 16:56:54 2010 +0900
ath5k: Add channel time to survey data
Include the channel utilization (busy, rx, tx) in the survey results.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3dd0923de491d72a041f82a9d0aaccc473fd2c42
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Oct 19 16:56:48 2010 +0900
ath5k: Optimize descriptor alignment
Similar to Felix Fietkau <nbd(a)openwrt.org> "ath9k_hw: optimize all descriptor
access functions" (13db2a80244908833502189a24de82a856668b8a).
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 123f5b8e6f411d342f2fc8a15c4d9349ace5074a
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Mon Oct 18 11:37:17 2010 +0530
ath9k: Remove the median function in rate control
With the current rate control selection method the median function is
nowhere used, so remove it.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ada9f1cacb66b74a68254521bb5e3ca4eb8fa871
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Oct 16 01:01:48 2010 +0200
ath9k_hw: optimize all descriptor access functions
Because all of the descriptor data structures are marked as __packed, GCC
assumes the worst case wrt. alignment and generates unaligned load/store
instructions on MIPS for access to all fields.
Since descriptors always have to be 4-byte-aligned, we can just mark the
data structures with __aligned(4), which allows GCC to generate much more
efficient code.
Verified through disassembly and OProfile comparisons.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f0e94b479c987abef17eb18e5c8e0ed178d00cd4
Author: Rafael J. Wysocki <rjw(a)sisk.pl>
Date: Sat Oct 16 00:36:17 2010 +0200
ath9k: Convert to new PCI PM framework
The ath9k driver uses the legacy PCI power management (suspend
and resume) callbacks that apparently cause intermittent problems
to happen (the adapter sometimes doesn't resume correctly on my
Acer Ferrari One). Make it use the new PCI PM and let the PCI core
code handle the PCI-specific details of power transitions.
Signed-off-by: Rafael J. Wysocki <rjw(a)sisk.pl>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 191d6a1186f65bc86c24b9d6d9d91acc155285ba
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Fri Oct 15 13:27:49 2010 -0700
ath9k: fix sparse complaint on aphy for debugfs
This fixes this sparse complaint:
CHECK drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.c:548:34: warning: symbol 'aphy' shadows an earlier one
drivers/net/wireless/ath/ath9k/debug.c:491:26: originally declared here
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 744bcb42a1ff1b9200e82dd074468877e31ff161
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:33 2010 +0200
ath9k_hw: make ath9k_hw_gettsf32 static
It is now only used in hw.c
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8eb1dabbd10e067cff671935d3e0c819f8e80d54
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:32 2010 +0200
ath9k: remove a redundant call to ath9k_hw_gettsf32
When the timer_next argument to ath9k_gen_timer_start is behind the tsf value,
tsf + timer_period is used, which is what ath_btcoex_period_timer was setting
it to.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9fa23e1741404207c414fad69212a8763c138bf0
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:31 2010 +0200
ath9k: optimize/fix ANI RSSI processing
ANI needs the RSSI average only in station mode, and only for tracking
the signal strength of beacons of the AP that it is connected to.
Adjust the code to track on the beacon RSSI, and store the average of that
in the ath_wiphy struct.
With these changes, we can get rid of this extra station lookup in the
rx path, which saves precious CPU cycles.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e0e9bc82fb0813fd353b0abbba0f1d6a680cc77c
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:30 2010 +0200
ath9k_hw: optimize tx status descriptor processing
Disassembly shows, that at least on MIPS, the compiler generates a lot of
memory accesses to the same location in the descriptor field parsing.
Since it is operating on uncached memory, this can be quite expensive in
this hot path.
Change the code a bit to help the compiler optimize it properly, and get
rid of some unused fields in the ath_tx_status struct.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 45684c75f9aa80eb477465bddcf79c9ad95206c7
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:29 2010 +0200
ath9k_hw: small optimization in ar9002_hw_get_isr
ah->config.rx_intr_mitigation does not need to be checked before checking
the rx interrupt mask for AR_ISR_RXMINTR or AR_ISR_RXINTM, as those
interrupts will be masked out if rx interrupt mitigation is disabled.
Avoid reading AR_ISR_S5_S twice by reordering the code to be more concise.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4df3071ebd92ef7115b409da64d0eb405d24a631
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 8 20:54:47 2010 +0100
ath9k_hw: optimize interrupt mask changes
OProfile showed that ath9k was spending way too much time in
ath9k_hw_set_interrupts. Since most of the interrupt mask changes only
need to globally enable/disable interrupts, it makes sense to split
this part into separate functions, replacing all calls to
ath9k_hw_set_interrupts(ah, 0) with ath9k_hw_disable_interrupts(ah).
ath9k_hw_set_interrupts(ah, ah->imask) only gets changed to
ath9k_hw_enable_interrupts(ah), whenever ah->imask was not changed
since the point where interrupts were disabled.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 790a11f268373b60069bc1371dc05143107c607c
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Oct 14 23:04:40 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Cc: Henry Ptasinski <henryp(a)broadcom.com>
Cc: Brett Rudley <brudley(a)broadcom.com>
Cc: Nohee Ko <noheek(a)broadcom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 794830e691a6b61d2de3fa9daeb609fd4ef4a4e7
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Oct 17 15:38:51 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Cc: Henry Ptasinski <henryp(a)broadcom.com>
Cc: Brett Rudley <brudley(a)broadcom.com>
Cc: Nohee Ko <noheek(a)broadcom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 038aaa382eb0a8fd6a0bbae7abc1383b9b57c543
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Oct 14 23:01:02 2010 +0200
b43: N-PHY: define channel table struct for rev3+ devices
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2af6fd8b18ceed416c9dfa675287c765aabf7d43
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:53 2010 +0000
net/ipv4/tcp.c: Update WARN uses
Coalesce long formats.
Align arguments.
Remove KERN_<level>.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b194a3674fba6d9f9e470084d192c7cb99194a62
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:52 2010 +0000
net/core/dev.c: Update WARN uses
Coalesce long formats.
Add missing newlines.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9c413ed55d5b52159e85a3937cda7f210a318048
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:34 2010 +0000
drivers/net/usb: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c389ff80d4b598f57d56aa807d396d4351cac8a4
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:33 2010 +0000
drivers/net/can: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 3 22:49:35 2010 +0000
drivers/net: normalize TX_TIMEOUT
Some network drivers use old TX_TIMEOUT definitions, assuming HZ=100 of
old kernels.
Convert these definitions to include HZ, since HZ can be 1000 these
days.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 973a34aa8593dbfe84386343c694f5beecb51d8a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Oct 31 05:38:25 2010 +0000
af_unix: optimize unix_dgram_poll()
unix_dgram_poll() is pretty expensive to check POLLOUT status, because
it has to lock the socket to get its peer, take a reference on the peer
to check its receive queue status, and queue another poll_wait on
peer_wait. This all can be avoided if the process calling
unix_dgram_poll() is not interested in POLLOUT status. It makes
unix_dgram_recvmsg() faster by not queueing irrelevant pollers in
peer_wait.
On a test program provided by Alan Crequy :
Before:
real 0m0.211s
user 0m0.000s
sys 0m0.208s
After:
real 0m0.044s
user 0m0.000s
sys 0m0.040s
Suggested-by: Davide Libenzi <davidel(a)xmailserver.org>
Reported-by: Alban Crequy <alban.crequy(a)collabora.co.uk>
Acked-by: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5456f09aaf88731e16dbcea7522cb330b6846415
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Oct 31 05:36:23 2010 +0000
af_unix: fix unix_dgram_poll() behavior for EPOLLOUT event
Alban Crequy reported a problem with connected dgram af_unix sockets and
provided a test program. epoll() would miss to send an EPOLLOUT event
when a thread unqueues a packet from the other peer, making its receive
queue not full.
This is because unix_dgram_poll() fails to call sock_poll_wait(file,
&unix_sk(other)->peer_wait, wait);
if the socket is not writeable at the time epoll_ctl(ADD) is called.
We must call sock_poll_wait(), regardless of 'writable' status, so that
epoll can be notified later of states changes.
Misc: avoids testing twice (sk->sk_shutdown & RCV_SHUTDOWN)
Reported-by: Alban Crequy <alban.crequy(a)collabora.co.uk>
Cc: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 67426b756c4d52c511c4b22b269accea171692a8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 20:44:44 2010 +0000
af_unix: use keyed wakeups
Instead of wakeup all sleepers, use wake_up_interruptible_sync_poll() to
wakeup only ones interested into writing the socket.
This patch is a specialization of commit 37e5540b3c9d (epoll keyed
wakeups: make sockets use keyed wakeups).
On a test program provided by Alan Crequy :
Before:
real 0m3.101s
user 0m0.000s
sys 0m6.104s
After:
real 0m0.211s
user 0m0.000s
sys 0m0.208s
Reported-by: Alban Crequy <alban.crequy(a)collabora.co.uk>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 03:09:24 2010 +0000
decnet: RCU conversion and get rid of dev_base_lock
While tracking dev_base_lock users, I found decnet used it in
dnet_select_source(), but for a wrong purpose:
Writers only hold RTNL, not dev_base_lock, so readers must use RCU if
they cannot use RTNL.
Adds an rcu_head in struct dn_ifaddr and handle proper RCU management.
Adds __rcu annotation in dn_route as well.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Steven Whitehouse <swhiteho(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e4a7b93bd5d84e1e79917d024d17d745d190fc9a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 01:52:46 2010 +0000
bonding: remove dev_base_lock use
bond_info_seq_start() uses a read_lock(&dev_base_lock) to make sure
device doesn’t disappear. Same goal can be achieved using RCU.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 840a185dddfd098b78b96a30da4cad722a7aef18
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 01:15:29 2010 +0000
aoe: remove dev_base_lock use from aoecmd_cfg_pkts()
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)
Convert aoecmd_cfg_pkts() to RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: "Ed L. Cashin" <ecashin(a)coraid.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d5439b9a29b1386d44a617cbaf2f7acde1d697c
Author: Arce, Abraham <x0066660(a)ti.com>
Date: Thu Oct 28 18:57:20 2010 +0000
ks8851: suspend resume support
Add suspend/resume support using default open/stop interface methods
to do hardware dependant operations.
On suspend, same low power state (soft power mode) will be kept, the
following blocks will be disabled:
- Internal PLL Clock
- Tx/Rx PHY
- MAC
- SPI Interface
Signed-off-by: Abraham Arce <x0066660(a)ti.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d0eaeec8e8dfdc31815941054802dcccd7c3fe1d
Merge: a7bcf21 aa58163
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 8 12:38:28 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 8b7347aab6865ae8a2e5a8b0f1deea12da3d3aff
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Sun Sep 19 15:56:30 2010 +0200
vhost: get/put_user -> __get/__put_user
We do access_ok checks on all ring values on an ioctl,
so we don't need to redo them on each access.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit dfe5ac5b18be5b10d01a17e734a9905c0def6088
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Tue Sep 21 14:18:01 2010 +0200
vhost: copy_to_user -> __copy_to_user
We do access_ok checks at setup time, so we don't need to
redo them on each access.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 64e1c80748afca3b4818ebb232a9668bf529886d
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Wed Oct 6 15:34:45 2010 +0200
vhost-net: batch use/unuse mm
Move use/unuse mm to vhost.c which makes it possible to batch these
operations.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 533a19b4b88fcf81da3106b94f0ac4ac8b33a248
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Wed Oct 6 15:34:38 2010 +0200
vhost: put mm after thread stop
makes it possible to batch use/unuse mm
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 3fcedec752108de5d99b9f0373ff880756a1e87d
Author: Julia Lawall <julia(a)diku.dk>
Date: Tue Oct 26 12:25:32 2010 +0200
drivers/vhost/vhost.c: delete double assignment
Delete successive assignments to the same location.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression i;
@@
*i = ...;
i = ...;
// </smpl>
Signed-off-by: Julia Lawall <julia(a)diku.dk>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
-----------------------------------------------------------------------
--
linux integration
1
0
linux integration; branch, for-next, created. v2.6.37-rc1-1723-gc6c8fea
by postmaster＠open-mesh.org 20 Dec '10
by postmaster＠open-mesh.org 20 Dec '10
20 Dec '10
The branch, for-next has been created
at c6c8fea29769d998d94fcec9b9f14d4b52b349d3 (commit)
- Shortlog ------------------------------------------------------------
commit c6c8fea29769d998d94fcec9b9f14d4b52b349d3
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Dec 13 11:19:28 2010 +0000
net: Add batman-adv meshing protocol
B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing
protocol for multi-hop ad-hoc mesh networks. The networks may be wired or
wireless. See http://www.open-mesh.org/ for more information and user space
tools.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b236da6931e2482bfe44a7865dd4e7bb036f3496
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Dec 14 03:09:15 2010 +0000
net: use NUMA_NO_NODE instead of the magic number -1
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit caafa84251b886feb6cdf23d50e2cc99dcdaaaf3
Author: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Date: Sun Dec 12 19:04:43 2010 +0000
bonding: add the debugfs interface to see RLB hash table
This patch provices the debugfs interface to see RLB hash table
like the following:
# cat /sys/kernel/debug/bonding/bond0/rlb_hash_table
SourceIP DestinationIP Destination MAC DEV
10.124.196.205 10.124.196.205 ff:ff:ff:ff:ff:ff eth4
10.124.196.205 10.124.196.81 00:19:99:XX:XX:XX eth3
10.124.196.205 10.124.196.1 00:21:d8:XX:XX:XX eth0
This is helpful to check if the receive load balancing works as expected.
Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 411204a5a1ec1a35363d8ef450c77e2b8235da4d
Author: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Date: Sun Dec 12 19:03:24 2010 +0000
bonding: migrate some macros from bond_alb.c to bond_alb.h
This patch simply migrates some macros from bond_alb.c to bond_alb.h.
Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ad6bad3efbb82206837daad8cba2bc9343d778bf
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:55 2010 +0000
cxgb4: NUMA-aware Tx queue allocations
Allocate Tx queue memory on the node indicated by the new
netdev_queue_numa_node_read.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 23d88e1d3e4a5b807ce6725f9294b7b9dfcd89a1
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:54 2010 +0000
cxgb4: extend VPD parsing
Current code parses the VPD RO section for keywords but makes static
assumptions about the location of the section. Remove them and parse
the VPD to find it.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 005b5717faac22264c1f61908ec5ac5b98108d99
Author: Joe Perches <joe(a)perches.com>
Date: Tue Dec 14 21:36:53 2010 +0000
cxgb4: add const to static arrays
Patch originally from Joe Perches, unmodified.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8f3a76769ee50a839282f70d07d5f3429524b68a
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:52 2010 +0000
cxgb4: remove a bitmap
The driver keeps a bitmap of the netdevs it registered so it knows what to
unregister later. Remove that and look at reg_state instead.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b1a3c2b698ec333edc86bf8b5a636162ca309870
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:51 2010 +0000
cxgb4: remove the name field from the adapter structure
Remove a field the driver uses to keep track of the name of the first
netdev it manages to register. Do this by changing the registration
loop to stop the first time it fails so the first registered device is
trivial to tell.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ba27816cd8167c64652406d86ca78bcc5989f20f
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:50 2010 +0000
cxgb4: correct formatting of MSI-X interrupt names
The last byte of the buffer for MSI-X names could not be used due to a
bogus -1. Also do not explicitly clear the last byte, snprintf will do
the right thing.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8cd18ac47f9642bcd0d30d4b3521359b1896c208
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:49 2010 +0000
cxgb4: allocate more space for MSI-X interrupt names
Currently MSI-X names for netdevs with long names are truncated in
/proc/interrupts due to insufficient space. Use IFNAMSIZ to size the
needed space.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 118969ed21b6895045b0a5a8a32feac1c9341096
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:48 2010 +0000
cxgb4: print port information after registering each netdev
Print information about each port when its netdev is registered instead
of looping separately over the ports at the end. The bulk of this patch
is due to indentation change.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7d5e77aafa39f3210b6273a44fe07508e837c3cb
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:47 2010 +0000
cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports
And fix the supported flags ethtool reports for the two cases.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a57cabe09f843a3f71277c485494496b3b9ee84a
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:46 2010 +0000
cxgb4: set the number of queues before device registration
The number of queues is known early, move the calls to
netif_set_real_num_[rt]x_queues before register_netdev.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ec16400823ce63bc0cfe89df78c6b7bf4a4d684b
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:45 2010 +0000
cxgb4: do not read the clock frequency from VPD
No need to read the clock frequency from VPD, we already get it a bit
later from FW, after any potential adjustments.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ef306b50b983be4873aed453c1feeaab22f3a098
Author: Dimitris Michailidis <dm(a)chelsio.com>
Date: Tue Dec 14 21:36:44 2010 +0000
cxgb4: enable PCIe relaxed ordering
Enable relaxed ordering for descriptor reads and packet I/O.
Signed-off-by: Dimitris Michailidis <dm(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 986d730a696277520084180071ac4873aac63905
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:50 2010 +0000
bnx2x: update version to 1.62.00-2
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b0200e250b5eef29e5ed8aa17979499affcc11cd
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 22:34:37 2010 +0200
bnx2x: remove old FW files
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5928c8baf67a36f553fe23a1b7820c7745e8bb2e
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:35 2010 +0000
bnx2x: replace FW to 6.2.5
Includes FCoE releated fixes in FW flows
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 40392d4e49c29bf5e939803d804dc8c7b600f297
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 22:28:42 2010 +0200
bnx2x: add FW 6.2.5 files
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bcab15c5d780bafb38311f00fcb263d03d2b00f1
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:25 2010 +0000
bnx2x: Add DCB/PFC support - link layer
Add appropriate HW DCB/PFC configuration
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e4901dde12d92b70dd13fa8b3bbc9df7a6129aab
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:18 2010 +0000
bnx2x: add DCB support
Adding DCB initialization and handling on 57712 FW/HW
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8307fa3e86a83924dd7f8310ce1e051f34986fe8
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:09 2010 +0000
bnx2x: add a select queue callback
This callback required to allow FCoE traffic to be
sent on separate priority queue from other L2 traffic,
which is managed by PFC in HW.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr(a)broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ec6ba945211b1c1f97d3d19fe60f166c9a92241d
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 05:44:01 2010 +0000
bnx2x: add FCoE ring
Includes new driver structures and FW/HW configuration for FCoE ring
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Shmulik Ravid-Rabinovitz <shmulikr(a)broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a3d22a68d752ccc1a01bb0a64dd70b7a98bf9e23
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Mon Dec 13 06:27:10 2010 +0000
bnx2x: Take the distribution range definition out of skb_tx_hash()
Move the calcualation of the Tx hash for a given hash range into a separate
function and define the skb_tx_hash(), which calculates a Tx hash for a
[0; dev->real_num_tx_queues - 1] hash values range, using this
function (__skb_tx_hash()).
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d33e455337ea2c71d09d7f4367d6ad6dd32b6965
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Dec 14 13:01:14 2010 -0800
net: Abstract default MTU metric calculation behind an accessor.
Like RTAX_ADVMSS, make the default calculation go through a dst_ops
method rather than caching the computation in the routing cache
entries.
Now dst metrics are pretty much left as-is when new entries are
created, thus optimizing metric sharing becomes a real possibility.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9fe146aef44afe5ec677d8150b6ae94e09b773f7
Merge: 6389aa7 4e53f78
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Dec 14 11:33:23 2010 -0800
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
commit 6389aa73ab8c15084fce18307a8e198eaff818da
Merge: 0dbaee3 1d212aa
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Dec 14 10:52:54 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Dec 13 12:52:14 2010 -0800
net: Abstract default ADVMSS behind an accessor.
Make all RTAX_ADVMSS metric accesses go through a new helper function,
dst_metric_advmss().
Leave the actual default metric as "zero" in the real metric slot,
and compute the actual default value dynamically via a new dst_ops
AF specific callback.
For stacked IPSEC routes, we use the advmss of the path which
preserves existing behavior.
Unlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates
advmss on pmtu updates. This inconsistency in advmss handling
results in more raw metric accesses than I wish we ended up with.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cc6f02dd490dac4ad821d5077b934c9b37037cd0
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Dec 13 12:50:49 2010 -0800
net: change ip_default_ttl documentation
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cfb7e5f187e787bb1430decea339fdea6a669f92
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:26 2010 +0000
pch_can: Replace netif_rx to netif_receive_skb
Since this driver is implemented as NAPI,
netif_receive_skb must be used not netif_rx.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0c78ab76a05cd788af0383354ffe819e0617f6a0
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:25 2010 +0000
pch_can: Add setting TEC/REC statistics processing
Add setting TEC/REC statistics processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fea9294c5f2902c45613681ad995ca27899d2016
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:24 2010 +0000
pch_can: Optimize "if" condition in rx/tx processing
For reduce "if" condition, easy to read/understand the code,
optimize "if" condition in rx/tx processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3332bc5446e034566e8a56bf7a7cd479ca35bd6d
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:23 2010 +0000
pch_can: Fix incorrect return processing
Fix incorrect return processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a6f6d6b51b110e661ae5f862d60c27da4970bec6
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:22 2010 +0000
pch_can: Move MSI processing to probe/remove processing
Currently, in case this driver is integrated as module, and when this
module is re-installed, no interrupts is to be occurred.
For the above issue, move MSI processing to open/release processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c755145649fa73bd197ac1a73d141047c61b543a
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:21 2010 +0000
pch_can: Comment optimization
Comment optimization
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d06848be64e13d5d1d73e581fb185e815893d8b7
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:20 2010 +0000
pch_can: Fix miss-setting status issue
Modify miss-setting status issue at suspend.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0e0805c4063d0611e282bb7fdebe2e223bfe7220
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:19 2010 +0000
pch_can: Fix bit timing calculation issue
Modify like use calculated value directly passed by CAN core module.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8714fcaca63203fe10331fe530ff48d3dd31de4e
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:18 2010 +0000
pch_can: Delete unnecessary/redundant code
Delete unnecessary/redundant code
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9388b166a323f8f7e35eb7a0d17b297ca695fa91
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:17 2010 +0000
pch_can: Fix coding rule violation
Fix coding rule violation.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 435b4efe93d4cec3aa0b36e8707df8d292d3641b
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:16 2010 +0000
pch_can: Replace netdev_dbg instead of dev_dbg partly
For easy to readable, use netdev_dbg instead of dev_dbg partly
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e91530ea959295a31911488c62088d5c372032ea
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:15 2010 +0000
pch_can: Change Copyright and module description
Currently, Copyright and module description are not formal.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 44c9aa890a2587f48920485b7487bc6d516dbbdf
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:14 2010 +0000
pch_can: Reduce register access
For improve tx/rx speed, reduce register access.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca2b004e89484e89b1815157fae2d7f933c5af9e
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:13 2010 +0000
pch_can: Change functions type
Currently, these two functions spec(returned value) is unnatural.
Thus, change the return value's spec
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bd58cbc322e97550af5e12584324b7117180435d
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:12 2010 +0000
pch_can: Rename function/macro name
For easy to read/understand, Rename function/macro name.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7f2bc50efeaeb1dff62ef7e128ae36499fbcf35d
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:11 2010 +0000
pch_can: Fix warnings
Currently, in case CONFIG_PM is disabled, compiler outputs warnings.
Move six functions which are used only CONFIG_PM is enabled,
into "#ifdef CONFIG_PM" area.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d5b4b2778e8e40f42ae5d9556777583f3556d81
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:10 2010 +0000
pch_can: Improve rx processing
Replace complex "goto" to "do~while".
For easy to read/understand, it divides a rx function into some functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8ac9702b9d5d81b819fc7d6b4f6abad22af01f3c
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:09 2010 +0000
pch_can: Fix endianness issue
there is endianness issue both Tx and Rx.
Currently, data is set like below.
Register:
MSB--LSB
x x D0 D1
x x D2 D3
x x D4 D5
x x D6 D7
But Data to be sent must be set like below.
Register:
MSB--LSB
x x D1 D0
x x D3 D2
x x D5 D4
x x D7 D6 (x means reserved area.)
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e489ccebf14657774fd877dc841b458703730586
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:08 2010 +0000
pch_can: Divide poll function
To easy to read/understand, divide poll function into two sub-functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 76d94b232940ca91e9b26c590cb7312ab88ff722
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Sun Dec 12 20:24:07 2010 +0000
pch_can: Add flow control processing
Currently, there is no flow control processing.
Thus, Add flow control processing as
when there is no empty of tx buffer,
netif_stop_queue is called.
When there is empty buffer, netif_wake_queue is called.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d212aa96e1b63459486f729af9a3fa38768b801
Merge: 8c4877a b761337
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Dec 13 15:20:45 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 249fab773dd5f689318c969ed649c4db077cdfc3
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Dec 13 12:16:14 2010 -0800
net: add limits to ip_default_ttl
ip_default_ttl should be between 1 and 255
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8c4877a4128e7931077b024a891a4b284d8756a3
Author: Joe Perches <joe(a)perches.com>
Date: Mon Dec 13 10:05:14 2010 -0800
ehea: Use the standard logging functions
Remove ehea_error, ehea_info and ehea_debug macros.
Use pr_fmt, pr_<level>, netdev_<level> and netif_<level> as appropriate.
Fix messages to use trailing "\n", some messages had an extra one
as the old ehea_<level> macros added a trailing "\n".
Coalesced long format strings.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 323e126f0c5995f779d7df7fd035f6e8fed8764d
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:55:08 2010 -0800
ipv4: Don't pre-seed hoplimit metric.
Always go through a new ip4_dst_hoplimit() helper, just like ipv6.
This allowed several simplifications:
1) The interim dst_metric_hoplimit() can go as it's no longer
userd.
2) The sysctl_ip_default_ttl entry no longer needs to use
ipv4_doint_and_flush, since the sysctl is not cached in
routing cache metrics any longer.
3) ipv4_doint_and_flush no longer needs to be exported and
therefore can be marked static.
When ipv4_doint_and_flush_strategy was removed some time ago,
the external declaration in ip.h was mistakenly left around
so kill that off too.
We have to move the sysctl_ip_default_ttl declaration into
ipv4's route cache definition header net/route.h, because
currently net/ip.h (where the declaration lives now) has
a back dependency on net/route.h
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a02e4b7dae455151c423e2f69ef222c502a321fd
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:39:02 2010 -0800
ipv6: Demark default hoplimit as zero.
This is for consistency with ipv4. Using "-1" makes
no sense.
It was made this way a long time ago merely to be consistent
with how the ipv6 socket hoplimit "default" is stored.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5170ae824ddf1988a63fb12cbedcff817634c444
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:35:57 2010 -0800
net: Abstract RTAX_HOPLIMIT metric accesses behind helper.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit abbf46ae0e4954584eac599bec73502c1c805e9e
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Dec 12 21:14:46 2010 -0800
ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1635953305694ece16d99078ca6d32f3d4e7eb36
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:15 2010 +0100
hostap: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. Drop flush_scheduled_work()
from prism2_free_local_data() and replace it with explicit flushing of
work items on the respective free functions. Work items in ap_data
are flushed from hostap_free_data() and the ones in local_info from
prism2_free_local_data().
Flush is used instead of cancel as some process and free items from
queue.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Jes Sorensen <jes(a)trained-monkey.org>
Cc: netdev(a)vger.kernel.org
commit 781ba4567698be9db7ca94d827c4b38d8583c168
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
i2400m: drop i2400m_schedule_work()
i2400m implements dynamic work allocation and queueing mechanism in
i2400_schedule_work(); however, this is only used for reset and
recovery which can be served equally well with preallocated per device
works.
Replace i2400m_schedule_work() with two work structs in struct i2400m.
These works are explicitly canceled when the device is released making
calls to flush_scheduled_work(), which is being deprecated,
unnecessary.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez(a)intel.com>
Cc: linux-wimax(a)intel.com
Cc: netdev(a)vger.kernel.org
commit fe8998c5e3b173f3d5c450bbde6173e7fbe5158d
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
sungem: update gp->reset_task flushing
gp->reset_task_pending is always set right before reset_task is
scheduled and as there is no synchronization between the setting and
scheduling, busy looping on reset_task_pending before flushing
reset_task doesn't really buy anything.
Directly flush gp->reset_task on suspend and cancel on detach.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: netdev(a)vger.kernel.org
commit 760141a53e5d72d4cc1d8c6e2a0232a24bedb36b
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
igb[v],ixgbe: don't use flush_scheduled_work()
All three drivers use flush_scheduled_work() similarly during driver
detach. Replace it with explicit cancels.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: e1000-devel(a)lists.sourceforge.net
Cc: netdev(a)vger.kernel.org
commit 9beb4896cec71e40738a7752072174fbf0d5b7b4
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
iseries_veth: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. Remove its usage from
iseries_veth.
* Cancelling a delayed work, queueing it for immediate execution if
cancelled and then waiting for completion can be done by simply
calling flush_delayed_work_sync().
* Explicitly cancel cnx->statemachine_wq on module unload.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Santiago Leon <santil(a)linux.vnet.ibm.com>
Cc: netdev(a)vger.kernel.org
commit f5c35cc191afd08d660e6db0fecc9f431dc8f273
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
ehea: don't use flush_scheduled_work()
Directly cancel port->reset_task from ehea_shutdown_single_port()
instead. As this cancels the work for each port on driver detach,
flushing system_wq from ehea_remove() or ehea_module_exit() is no
longer necessary.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Cc: netdev(a)vger.kernel.org
commit 3d6b892bcc4c810071e36d8aff25aa171f55f93d
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
ehea: kill unused ehea_rereg_mr_task
ehea_rereg_mr_task is not used. Remove it and drop @work parameter
from ehea_rereg_mrs().
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Cc: netdev(a)vger.kernel.org
commit 23f333a2bfafba80339315b724808982a9de57d9
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
drivers/net: don't use flush_scheduled_work()
flush_scheduled_work() is on its way out. This patch contains simple
conversions to replace flush_scheduled_work() usage with direct
cancels and flushes.
Directly cancel the used works on driver detach and flush them in
other cases.
The conversions are mostly straight forward and the only dangers are,
* Forgetting to cancel/flush one or more used works.
* Cancelling when a work should be flushed (ie. the work must be
executed once scheduled whether the driver is detaching or not).
I've gone over the changes multiple times but it would be much
appreciated if you can review with the above points in mind.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Jay Cliburn <jcliburn(a)gmail.com>
Cc: Michael Chan <mchan(a)broadcom.com>
Cc: Divy Le Ray <divy(a)chelsio.com>
Cc: e1000-devel(a)lists.sourceforge.net
Cc: Vasanthy Kolluri <vkolluri(a)cisco.com>
Cc: Samuel Ortiz <samuel(a)sortiz.org>
Cc: Lennert Buytenhek <buytenh(a)wantstofly.org>
Cc: Andrew Gallatin <gallatin(a)myri.com>
Cc: Francois Romieu <romieu(a)fr.zoreil.com>
Cc: Ramkrishna Vepa <ramkrishna.vepa(a)exar.com>
Cc: Matt Carlson <mcarlson(a)broadcom.com>
Cc: David Brownell <dbrownell(a)users.sourceforge.net>
Cc: Shreyas Bhatewara <sbhatewara(a)vmware.com>
Cc: netdev(a)vger.kernel.org
commit 6e07ebd84eef00be9e169a6d15a0bc20b06578fa
Author: Tejun Heo <tj(a)kernel.org>
Date: Sun Dec 12 16:45:14 2010 +0100
drivers/net: remove unnecessary flush_scheduled_work() calls
janz-ican3, sh_eth, skge and vxge don't use workqueue at all and there
is no reason to flush the system_wq. Drop flush_scheduled_work()
calls and references to workqueue.
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Cc: "David S. Miller" <davem(a)davemloft.net>
Cc: Wolfgang Grandegger <wg(a)grandegger.com>
Cc: Stephen Hemminger <shemminger(a)linux-foundation.org>
Cc: Ramkrishna Vepa <ramkrishna.vepa(a)exar.com>
Cc: Sivakumar Subramani <sivakumar.subramani(a)exar.com>
Cc: Sreenivasa Honnur <sreenivasa.honnur(a)exar.com>
Cc: Jon Mason <jon.mason(a)exar.com>
Cc: netdev(a)vger.kernel.org
commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0
Author: Manuel Lauss <manuel.lauss(a)googlemail.com>
Date: Sat Dec 11 09:53:42 2010 +0000
net: au1000_eth: remove unused global variable.
The driver global au_macs[] is unused in the entire kernel tree,
so remove it.
Signed-off-by: Manuel Lauss <manuel.lauss(a)googlemail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 85a564983aff948b9ea8b6e734b3e80b5755d12a
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:04 2010 +0000
s2io: Using static const generally increases object text and decreases data size. It also generally decreases overall object size.
text data bss dec hex filename
109387 389 24432 134208 20c40 drivers/net/s2io.o.old
109358 389 24432 134179 20c23 drivers/net/s2io.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 11410b62cf9bdaed5863696c7994286a900424c7
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:03 2010 +0000
s2io: Update Driver Version
Update Driver Version
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c0dbf37e78c5c1e3e6cfeb39de30518fdde33e83
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:02 2010 +0000
s2io: make strings at tables const
Put immutable data in read/only section.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1853e2e15dc95ff3430530941b5856581251ef70
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 15:40:01 2010 +0000
s2io: rx_ring_sz bounds checking
modparm rx_ring_sz can be set to be greater than the maximum allowable
number of blocks. This results in an array overrun when probing the
driver, and causes memory corruption.
Also, the MAX_RX_DESC_1 multiply the max number of rings by max number
of blocker per ring by 127, but the driver does the same calculation
with 127+1. This results in the possibility of the value being set
being larger than the maximum allowable value.
Finally, clean-up the s2io_ethtool_gringparam code to be more
intuitive.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9835fd7321a67feba6432e63bf2cba43f5a56bd9
Author: Carolyn Wyborny <carolyn.wyborny(a)intel.com>
Date: Mon Nov 22 17:17:21 2010 +0000
igb: Add new function to read part number from EEPROM in string format
New adapters will have part numbers stored in string format rather than
simple hex format. This function will read part number formats in either
hex or string.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c920aa8b87bfec3dbd926ae777430e613e5088df
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Dec 1 08:45:24 2010 +0000
e1000e: increment the driver version
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 61c758166701c4f156c0aba10260f5729b1a6f43
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Thu Dec 9 23:04:25 2010 +0000
e1000e: static analysis tools complain of a possible null ptr p dereference
Adding this default case resolves the issue.
v2- Removed "break" in default case based on feedback
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e9262447233037e9336d5866628821156a17366f
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:02:06 2010 +0000
e1000e: minor error message corrections
Correct error messages when setting up Rx resources and when checking
module parameters.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 36b973df713e1395b79896de667ad7dbb1925fa7
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 07:42:43 2010 +0000
e1000e: prevent null ptr dereference in e1000_tx_queue()
tx_desc can be dereferenced as a null pointer when count is passed in
as 0.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 073287c037083497ebaaf75ead469b769f218615
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:51 2010 +0000
e1000e: support new PBA format from EEPROM
Provide support to e1000e for displaying the new format of the PBA found
in the EEPROM. The unique PBA identifier is no longer restricted to
hexadecimal numbers and must now be read and displayed as a string.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 664dc878ed6f0476b875547547a49e06f7a4e73b
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:46 2010 +0000
e1000e: 82579 PHY incorrectly identified during init
During init, reading the 2 PHY ID registers back-to-back in the default
fast mode could return invalid data (all F's) and in slow mode could
return data to the second read the data from the first read. To resolve
the issue in fast mode, set to slow mode before any PHY accesses; to
resolve the issue in slow mode, put in a delay for every 82579 PHY access.
Since this PHY is currently only paired with the pch2lan MAC and the PHY
type is not known before the first PHY access which can fail this way,
check for this based on MAC-type.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ce54afd16d874ac07378a8bb55d26f7f5b613c0e
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:41 2010 +0000
e1000e: 82577/8/9 mis-configured OEM bits during S0->Sx
The LPLU (Low Power Link Up) and Gigabit Disable bits (a.k.a. OEM bits)
were being configured incorrectly when device goes to D3 state.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d9c76f99c2a79feb413e3e751362d59c0f5323f6
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:35 2010 +0000
e1000e: 82571 Serdes can fail to get link
When link partner is sending continuous Config symbols, the 82571 Serdes
FIFO can overflow resulting in Invalid bit getting set. To resolve this,
if Sync and Config bits are both 1 ignore the Invalid bit and restart
auto-negotiation.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit cbd006cb7d4e7b76c6febf7f51e970bced132914
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:30 2010 +0000
e1000e: 82577/8 must acquire h/w semaphore before workaround
The workaround function e1000_configure_k1_pchlan() assumes the h/w
semaphore is already acquired. This was originally missed when setting up
the part for the ethtool loopback test.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ed5c2b0b78e5467f7948bef92b21f3c76823f392
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:25 2010 +0000
e1000e: 82574/82583 performance improvement
Increasing the transmit fifo by 4K (by decreasing the receive fifo size
specified in .pba by the same amount) increases Tx performance.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a82a14f4cdcfedb27eacec8eb4d9e47d42c10d43
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Wed Nov 24 06:01:20 2010 +0000
e1000e: 82571-based mezzanine card can fail ethtool link test
On certain 82571-based mezzanine NICs in some blade servers, the ethtool
link test can fail due to the serdes_has_link flag not set correctly.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9633e63bb1d82c02950983d5d3317e6656b11c8e
Author: Holger Eitzenberger <holger(a)eitzenberger.org>
Date: Wed Nov 17 15:43:52 2010 +0000
e1000e: fix double initialization in blink path
The kernel goes BUG() at the time 'ethtool -p eth0 3' comes
back, which is due to adapter->led_blink_task initialized
several times. At the time it is still running this results
in a corrupted task_list of the associated workqueue.
The fix is to move the workqueue initialization to the
probe function instead.
Signed-off-by: Holger Eitzenberger <holger(a)eitzenberger.org>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9fe93afdd07aba52a018eb52784124579a80470e
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 09:33:54 2010 +0000
ixgbe: cleanup string function calls to use bound checking versions.
Some minor cleanup to use string calls that use bound checks just to
be extra safe.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5136cad37b276e3e11c4f8ad0bcf9cb2eec0e5af
Author: Emil Tantilov <emil.s.tantilov(a)intel.com>
Date: Wed Dec 1 05:47:05 2010 +0000
ixgbe: fix ntuple support
commit f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef
ixgbe: Update ixgbe to use new vlan accleration.
removed ETH_FLAG_NTUPLE from the supported flags.
This patch puts it back on to allow for setting ntuple via ethtool.
CC: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d994653db465616a7bf27703e733170c47488cdf
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Thu Dec 9 06:55:19 2010 +0000
ixgbe: fix X540 to use it's own info struct
This patch enables X540 hardware to use it's own set of support
functions. This is useful as it has no need of SFP+ support. A
couple minor bugs with the eeprom semaphore were also cleaned up.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 2b264909c660717a67da997a181a4a4f551ef9b6
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Thu Dec 9 06:55:14 2010 +0000
ixgbe: fix X540 phy id to correct value
The existing PHY ID for X540 was from early production hardware and
is no longer correct. This patch corrects that.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ae54496f9e8d40c89e5668205c181dccfa9ecda1
Author: Emil Tantilov <emil.s.tantilov(a)intel.com>
Date: Sat Dec 4 05:35:17 2010 +0000
ixgb: Don't check for vlan group on transmit
Based on a patch from Jesse Gross.
Enable vlan tag insertion even when vlan group is not configured.
For ixgb HW both CTRL0.VME and VLE bit in the Tx descriptor need to be set
in order to enable HW acceleration.
Introduced separate functions for enabling/disabling of vlan tag stripping
similar to ixgbe.
CC: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 667445008db3f45a760c235d771be0c9671e59e5
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Wed Dec 1 19:59:50 2010 +0000
Intel Wired LAN drivers: Use static const
Based on work by Joe Perches <joe(a)perches.com>
Using static const to decrease data and overall object size.
CC: Joe Perches <joe(a)perches.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
commit 19a0b67afd174c4db261d587b5c67704dcd53c17
Author: Dean Nelson <dnelson(a)redhat.com>
Date: Thu Nov 11 05:50:25 2010 +0000
e1000: fix return value not set on error
Dean noticed that 'err' wasn't being set when the "goto err_dma"
statement is executed in the following hunk from the commit. It's value
will be zero as a result of a successful call to e1000_init_hw_struct().
This patch changes the error condition to be correctly propagated.
CC: stable(a)kernel.org
Signed-off-by: Dean Nelson <dnelson(a)redhat.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit fa795e6b9c59a14c80a475428df7e4cb97396f47
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Fri Dec 10 00:09:08 2010 -0800
MAINTAINERS: Update Intel Wired LAN info
Update with Intel Wired Ethernet public git trees.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit dabee56860bc6b617c7ea481bb9b00fba41c9c48
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Fri Dec 10 00:01:44 2010 -0800
Documentation/networking/ixgbevf.txt: Update documentation
Update Intel Wired LAN ixgbevf documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 872857a84e18f4bf9b56b298309a977b2ce77b5b
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:55:47 2010 -0800
Documentation/networking/ixgbe.txt: Update ixgbe documentation
Update Intel Wired LAN ixgbe documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit f2be1429798785c6b7d4747ac1fda2c40b3f26eb
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:49:34 2010 -0800
Documentation/networking/igbvf.txt: Update documentation
Update Intel Wired LAN igbvf documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 1ffd7246445038569f4c2f4b39bda1e71e68f1a2
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:47:39 2010 -0800
Documentation/networking/igb.txt: update documentation
Update Intel Wired LAN igb documentation.
v2- Updated the ethtool support link, removed the LRO section and
anti-spoofing sections.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 072ed34fa97374b390a2493fa281ec8a7888b312
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:44:42 2010 -0800
Documentation/networking/e1000e.txt: Update documentation
Update Intel Wired LAN e1000e documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 96c3c0330dea8856f02fc59e25c866d6d5eebed5
Author: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Date: Thu Dec 9 23:42:00 2010 -0800
Documentation/networking/e1000.txt: Update documentation
Update Intel Wired LAN e1000 documentation.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a5d62a149bb8f5359aff7ed7dce339752fbabfd9
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 16:49:24 2010 -0800
isdn: Fix printed out copy_from_user() return value after previous change.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f073c7ca29a4a7e14060d9d3ddf09bfbb7cd9cc0
Author: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Date: Thu Dec 9 15:17:13 2010 +0000
bonding: add the debugfs facility to the bonding driver
This patch provides the debugfs facility to the bonding driver.
The "bonding" directory is created in the debugfs root and directories of
each bonding interface (like bond0, bond1...) are created in that.
# mount -t debugfs none /sys/kernel/debug
# ls /sys/kernel/debug/bonding
bond0 bond1
Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com>
Signed-off-by: Jay Vosburgh <fubar(a)us.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6c2c9d964e71770e7d6efc1a82f3621005d12185
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Fri Dec 10 12:02:33 2010 +0000
enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 36accaed22347f4b09cbc3c9fe2c1163a3575ea1
Author: Dan Carpenter <error27(a)gmail.com>
Date: Fri Dec 10 02:40:09 2010 +0000
isdn: return -EFAULT if copy_from_user() fails
We should be returning -EFAULT here.
Mostly this patch is to silence a smatch warning. The upper levels
of this driver turn all non-zero return values from isar_load_firmware()
into 1.
Signed-off-by: Dan Carpenter <error27(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5d52040d4d1eabb56a4d51b760ab8f74eabb9001
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:03:02 2010 +0000
vxge: update driver version
Update vxge driver version to 2.5.1
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b55e7b153f698bb027102759388d0c09542f68bd
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:03:01 2010 +0000
vxge: independent interrupt moderation
Configure the workload clock register and TIM register for independent
interrupt moderation based on the individual vpath utilization instead
of common link utilization. This greatly improves latency.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9c1638871671721e8f3693a0dfbb0e2e05b08742
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:03:00 2010 +0000
vxge: hotplug stall
When hot-unplugging a vxge adapter while running, the driver's remove
routine prints warning and then stalls the calling thread. This is due
to vxge_remove calling vxge_device_unregister to unregister the netdev
before calling flush_scheduled_work clear any pending work. Swapping
the order of these two functions resolves the issue.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2e41f6449c561e6e3f572e11d0f2240bd51104db
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:59 2010 +0000
vxge: transmit timeout deadlock
Use a workqueue to handle the device reset during a transmit timeout, as
there can be a deadlock during bringup. Also, set the netif carrier off
before the watchdog reset is started to prevent the timeout from
reoccurring while still processing the first.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:58 2010 +0000
vxge: use pci_request_region()
Only BAR0 is ever accessed, thus making the calls to pci_request_regions
overkill. Change calls of pci_request_regions to pci_request_region to
reduce the size of the mapped area.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c92bf70dcb9d08f821e4c9f09f8fc328495ba998
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:57 2010 +0000
vxge: fix crash of VF when unloading PF
Calling pci_disable_sriov when unloading a SR-IOV physical function
driver from a host when a guest is using a virtual function from that
device can cause a host crash or VM crash. The crash is caused by the
virtual config space no longer being present when PF is removed (due to
the pci_disable_sriov). This can be avoided by not calling
pci_disable_sriov to disable the PCI space when shutting down the PF.
Each function in the X3100 operates independently and in this case will
operate properly in the absence of the PF.
Also, added improved logic in the detection of SR-IOV initialization.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 528f727279ae840db8a06c94f5e82cdaeb00da6f
Author: Jon Mason <jon.mason(a)exar.com>
Date: Fri Dec 10 14:02:56 2010 +0000
vxge: code cleanup and reorganization
Move function locations to remove the need for internal declarations and
other misc clean-ups.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Arpit Patel <arpit.patel(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit deef4b522b814593407cfd56216840c2b75e9f15
Author: Herbert Xu <herbert(a)gondor.apana.org.au>
Date: Thu Dec 9 17:38:11 2010 +0000
bridge: Use consistent NF_DROP returns in nf_pre_routing
The nf_pre_routing functions in bridging have collected two
distinct ways of returning NF_DROP over the years, inline and
via goto. There is no reason for preferring either one.
So this patch arbitrarily picks the inline variant and converts
the all the gotos.
Also removes a redundant comment.
Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c053fd96d0d3d18c721f880b8fdd0b925894d9c4
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Dec 10 16:02:20 2010 -0800
af_packet: use swap() instead of the open coded macro XC()
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ed4ba4b5b96742d29225308ccccbdb1810b63064
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 9 12:10:25 2010 +0000
netdev: Use default implementation of ethtool_ops::get_link where possible
Various drivers are using implementations of ethtool_ops::get_link
that are equivalent to the default ethtool_op_get_link(). Change
them to use that instead.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e596e6e4d578f2639416e620d367a3af34814a40
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 9 12:08:35 2010 +0000
ethtool: Report link-down while interface is down
While an interface is down, many implementations of
ethtool_ops::get_link, including the default, ethtool_op_get_link(),
will report the last link state seen while the interface was up. In
general the current physical link state is not available if the
interface is down.
Define ETHTOOL_GLINK to reflect whether the interface *and* any
physical port have a working link, and consistently return 0 when the
interface is down.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 29639059a0122d95b34b5475bd9fee3910b401a3
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Wed Dec 8 13:54:03 2010 +0000
enic: Use VF mac set by IFLA_VF_MAC in port profile provisioning data
This patch adds support in enic 802.1Qbh port profile provisioning code
to use the mac address set by IFLA_VF_MAC. For now we handle this mac as a
special case for a VM mac address sent to us by libvirt. The VM mac address
is sent to the switch along with the rest of the port profile provisioning
data. This patch also adds calls to register and deregister the mac address
during port profile association/deassociation.
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Wed Dec 8 13:53:58 2010 +0000
enic: Add ndo_set_vf_mac support for enic dynamic devices
This patch implements the ndo_set_vf_mac netdev operation for enic
dynamic devices. It treats the mac address set by IFLA_VF_MAC as a
special case to use it in the port profile provisioning data.
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 319d7e847355ec7e03d3c865917b2b0e2e592fb8
Author: Roopa Prabhu <roprabhu(a)cisco.com>
Date: Wed Dec 8 13:19:58 2010 +0000
enic: Add ndo_set_rx_mode support for enic vnics
Add ndo_set_rx_mode support to register unicast and multicast
address filters for enic devices
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: Christian Benvenuti <benve(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a8d764b9832d3cc86019f71916665dd2d337d7c2
Author: Junchang Wang <junchangwang(a)gmail.com>
Date: Wed Dec 8 16:55:16 2010 +0000
pktgen: adding prefetchw() call
We know for sure pktgen is going to write skb->data right after
*_alloc_skb, causing unnecessary cache misses.
Idea is to add a prefetchw() call to prefetch the first cache line
indicated by skb->data. On systems with Adjacent Cache Line Prefetch,
it's probably two cache lines are prefetched.
With this patch, pktgen on Intel SR1625 server with two E5530
quad-core processors and a single ixgbe-based NIC went from 8.63Mpps
to 9.03Mpps, with 4.6% improvement.
Signed-off-by: Junchang Wang <junchangwang(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4afb7527ac8cc7bd8f03570e12f6eed0eca03363
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Dec 6 12:33:01 2010 +0000
sfc: convert references to LRO to GRO
This driver now uses Generic Receive Offload, not the older LRO.
Change references to LRO in names and comments.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Acked-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 376d940ee91318cc6becefbb9454bb4454d7473f
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 9 04:37:48 2010 +0000
inet6: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0e51d67ebb8e109a0990a13dafa937fb469aa3fb
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 9 04:50:22 2010 +0000
stmmac: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 040253c931e336360453c8d81f76d1b010b2b5e7
Author: Martin Willi <martin(a)strongswan.org>
Date: Wed Dec 8 04:37:51 2010 +0000
xfrm: Traffic Flow Confidentiality for IPv6 ESP
Add TFC padding to all packets smaller than the boundary configured
on the xfrm state. If the boundary is larger than the PMTU, limit
padding to the PMTU.
Signed-off-by: Martin Willi <martin(a)strongswan.org>
Acked-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d979e20f2b9f8a50c8d5f889e0b5d78580440d1f
Author: Martin Willi <martin(a)strongswan.org>
Date: Wed Dec 8 04:37:50 2010 +0000
xfrm: Traffic Flow Confidentiality for IPv4 ESP
Add TFC padding to all packets smaller than the boundary configured
on the xfrm state. If the boundary is larger than the PMTU, limit
padding to the PMTU.
Signed-off-by: Martin Willi <martin(a)strongswan.org>
Acked-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 35d2856b4693e8de5d616307b56cef296b839157
Author: Martin Willi <martin(a)strongswan.org>
Date: Wed Dec 8 04:37:49 2010 +0000
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
The XFRMA_TFCPAD attribute for XFRM state installation configures
Traffic Flow Confidentiality by padding ESP packets to a specified
length.
Signed-off-by: Martin Willi <martin(a)strongswan.org>
Acked-by: Herbert Xu <herbert(a)gondor.apana.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 957fca95e3521e471aac4c2e4cfbc21f399bdd84
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Sat Dec 4 15:01:52 2010 +0000
ifb: use the lockless variants of skb_queue
rq and tq are both protected by tx queue lock, so we can simply use
the lockless variants of skb_queue.
skb_queue_splice_tail_init() is used instead of the open coded and slow
one.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi(a)cyberus.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c6350362cbb19882ba0eb3578cc1abc07e6ea204
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Dec 3 19:55:20 2010 +0000
ifb: remove unused macro TX_TIMEOUT
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi(a)cyberus.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1f91505025db74c261962dc16d58f79b9b0c83c
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Dec 3 19:55:19 2010 +0000
ifb: remove the useless debug stats
These debug stats are not exported, and become useless.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi(a)cyberus.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a6a5ff26975c87a97f88c6ea077c325ff20c4cf2
Author: Jan Glauber <jang(a)linux.vnet.ibm.com>
Date: Wed Dec 8 02:58:01 2010 +0000
qeth: buffer count imbalance
The used buffers counter is not incremented in case of an error so
the counter can become negative. Increment the used buffers counter
before checking for errors.
Signed-off-by: Jan Glauber <jang(a)linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 91d4576bfe87980b1b86305c29912d96b96ce98e
Author: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Date: Wed Dec 8 02:58:00 2010 +0000
qeth: l3 add vlan hdr in passthru frames
OSA l3 mode is hw accelerated VLAN only for IPv4. Take care we
add the vlan hdr to a passthru frame in the device driver.
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f154b79cd7db221240ab6e8e4d844d3a3f10b04c
Author: Einar Lueck <elelueck(a)de.ibm.com>
Date: Wed Dec 8 02:57:59 2010 +0000
qeth: support VIPA add/del in offline mode
Only work through the IP adddress to do list if the card is UP or
SOFTSETUP. Enables to configure VIPA add/del in offline mode.
Signed-off-by: Einar Lueck <elelueck(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d0ddf30fdd2b98fb547ffa33bb79a7a96ef8d7dd
Author: Einar Lueck <elelueck(a)de.ibm.com>
Date: Wed Dec 8 02:57:58 2010 +0000
qeth: support ipv6 query arp cache for HiperSockets
Function qeth_l3_arp_query now queries for IPv6 addresses, too, if
QETH_QARP_WITH_IPV6 is passed as parameter to the ioctl. HiperSockets
and GuestLAN in HiperSockets mode provide corresponding entries.
Signed-off-by: Einar Lueck <elelueck(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c07224005dd3fe746246acadc9be652a588a4d7f
Author: Jiri Pirko <jpirko(a)redhat.com>
Date: Thu Dec 9 03:40:30 2010 +0000
net/ipv6/udp.c: fix typo in flush_stack()
skb1 should be passed as parameter to sk_rcvqueues_full() here.
Signed-off-by: Jiri Pirko <jpirko(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 457de4383ec6144df7d5a82cdfb110c825305a51
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 13:16:09 2010 -0800
ipv6: Fix 'release_it' logic in tcp_v6_get_peer()
We accidently set it to "true" for the case where we
are using a route bound peer.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4c0833bcd4d302fe783b9f8286a00ca2999d6200
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Fri Dec 10 03:18:04 2010 +0000
bridge: Fix return values of br_multicast_add_group/br_multicast_new_group
If br_multicast_new_group returns NULL, we would return 0 (no error) to
the caller of br_multicast_add_group, which is not what we want. Instead
br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case.
Also propagate the error number returned by br_mdb_rehash properly.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit eaa7dcde1d092c792cbca4be81d2e506e84c6122
Merge: cf78f8e b7ec19a
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 11:22:57 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4
Merge: 1e13f86 c39d35e
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 10:20:43 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
commit 1e13f863ca88014d9550876c05c939fdab1017d1
Merge: f404c2f f435d9e
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Dec 10 09:50:47 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
commit b7ec19af63b467e30189984fb24e6157603608e3
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Fri Dec 10 12:49:23 2010 +0100
dccp: remove unused macros
Remove macros which have been unused since the initial implementation
(commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c, [DCCP]: Initial
implementation from Tue Aug 9 20:14:34 2005 -0700).
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Acked-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit f404c2fea37e02bec7c8b6edddf5edd22ca60505
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:37 2010 +0000
bnx2x: Update version number and a date.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5cd737c2e84bebf532f536f7addfdd75162bba04
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:29 2010 +0000
bnx2x: Fixed a compilation warning
bnx2x_src_init_t2() is used only when BCM_CNIC is defined.
So, to avoid a compilation warning, we won't define it unless
BCM_CNIC is defined.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d245a1111251d77c804e9fe362e9f70aba856e1e
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:17 2010 +0000
bnx2x: Use dma_alloc_coherent() semantics for ILT memory allocation
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2297a2da5a8507bf6596dc30ace3483c00bd85ed
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Dec 8 01:43:09 2010 +0000
bnx2x: LSO code was broken on BE platforms
Make the LSO code work on BE platforms: parsing_data field of
a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong
values for TCP header's length and offset and, as a result, the corresponding
PCI device was performing bad DMA reads triggering EEH.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4bc65dd8d88671712d71592a83374cfb0b5fce7a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Dec 7 22:26:15 2010 +0000
filter: use size of fetched data in __load_pointer()
__load_pointer() checks data we fetch from skb is included in head
portion, but assumes we fetch one byte, instead of up to four.
This wont crash because we have extra bytes (struct skb_shared_info)
after head, but this can read uninitialized bytes.
Fix this using size of the data (1, 2, 4 bytes) in the test.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 60d509c823cca21e77d537bd356785f7cfe8f0d1
Author: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Date: Fri Dec 3 02:39:01 2010 +0000
The new jhash implementation
The current jhash.h implements the lookup2() hash function by Bob Jenkins.
However, lookup2() is outdated as Bob wrote a new hash function called
lookup3(). The patch replaces the lookup2() implementation of the 'jhash*'
functions with that of lookup3().
You can read a longer comparison of the two and other hash functions at
http://burtleburtle.net/bob/hash/doobs.html.
Signed-off-by: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Acked-by: Rusty Russell <rusty(a)rustcorp.com.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 68835aba4d9b74e2f94106d13b6a4bddc447c4c8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 30 19:04:07 2010 +0000
net: optimize INET input path further
Followup of commit b178bb3dfc30 (net: reorder struct sock fields)
Optimize INET input path a bit further, by :
1) moving sk_refcnt close to sk_lock.
This reduces number of dirtied cache lines by one on 64bit arches (and
64 bytes cache line size).
2) moving inet_daddr & inet_rcv_saddr at the beginning of sk
(same cache line than hash / family / bound_dev_if / nulls_node)
This reduces number of accessed cache lines in lookups by one, and dont
increase size of inet and timewait socks.
inet and tw sockets now share same place-holder for these fields.
Before patch :
offsetof(struct sock, sk_refcnt) = 0x10
offsetof(struct sock, sk_lock) = 0x40
offsetof(struct sock, sk_receive_queue) = 0x60
offsetof(struct inet_sock, inet_daddr) = 0x270
offsetof(struct inet_sock, inet_rcv_saddr) = 0x274
After patch :
offsetof(struct sock, sk_refcnt) = 0x44
offsetof(struct sock, sk_lock) = 0x48
offsetof(struct sock, sk_receive_queue) = 0x68
offsetof(struct inet_sock, inet_daddr) = 0x0
offsetof(struct inet_sock, inet_rcv_saddr) = 0x4
compute_score() (udp or tcp) now use a single cache line per ignored
item, instead of two.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit defb3519a64141608725e2dac5a5aa9a3c644bae
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 21:16:57 2010 -0800
net: Abstract away all dst_entry metrics accesses.
Use helper functions to hide all direct accesses, especially writes,
to dst_entry metrics values.
This will allow us to:
1) More easily change how the metrics are stored.
2) Implement COW for metrics.
In particular this will help us put metrics into the inetpeer
cache if that is what we end up doing. We can make the _metrics
member a pointer instead of an array, initially have it point
at the read-only metrics in the FIB, and then on the first set
grab an inetpeer entry and point the _metrics member there.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
commit b7613370db5ba66ad81e41cd3a5417fde4d5e03c
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Thu Dec 9 09:08:47 2010 -0500
ath: fix build break with ATH_DBG_WARN_ON_ONCE
Description by Hauke:
"If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and
returns something, but if CONFIG_ATH_DEBUG is not set it does not return
anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in
an if case and is not returning anything and causes a compile error.
CC [M] /drivers/net/wireless/ath/ath9k/main.o
/drivers/net/wireless/ath/ath9k/main.c: In function ‘ath_isr’:
/drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression
before ‘do’
make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1
make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2"
Reported-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4e53f78e5b06c073a5c10814c72e98c1ca8a9f10
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 19:16:37 2010 +0200
tools/virtio: virtio_test tool
This is the userspace part of the tool: it includes a bunch of stubs for
linux APIs, somewhat simular to linuxsched. This makes it possible to
recompile the ring code in userspace.
A small test example is implemented combining this with vhost_test
module.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 71ccc212e5b28dfcc870b6db6589c2df264fdc6a
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 19:09:01 2010 +0200
vhost test module
This adds a test module for vhost infrastructure.
Intentionally not tied to kbuild to prevent people
from installing and loading it accidentally.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 28831ee60b79bed50958c9cb0d2e76cdc98406f9
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 10:22:10 2010 +0200
vhost: better variable name in logging
We really store a page offset in write_address,
so rename it write_page to avoid confusion.
Signed-off-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit b7ee1d01c5ff3bf2e51c8565ea00823cdbc2a9f3
Author: Sedat Dilek <sedat.dilek(a)gmail.com>
Date: Tue Dec 7 22:35:50 2010 +0100
ath5k: Fix modinfo does not list alias -> pci-id lines
The AHB bus support patchset moved the table "Known PCI ids" from base.c
to pci.c - unfortunately, MODULE_DEVICE_TABLE() was not transferred.
With this fix 'modinfo ath5k' lists the alias -> pci-id lines, again.
The issue was introduced by:
commit e5b046d86fac609f636d127a38de94a175c7e83b
"ath5k: Move PCI bus functions to separate file."
Signed-off-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3bf9be40ff76b6df136f14a497167c116b2b3c53
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Mon Nov 29 10:19:07 2010 +0200
vhost: correctly set bits of dirty pages
Fix two bugs in dirty page logging:
When counting pages we should increase address by 1 instead of
VHOST_PAGE_SIZE. Make log_write() correctly process requests
that cross pages with write_address not starting at page boundary.
Reported-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit a290aec88a9c4747353ea7aa9b2569bd61297c3c
Author: Jason Wang <jasowang(a)redhat.com>
Date: Mon Nov 29 13:48:40 2010 +0800
vhost: fix typos in comment
Signed-off-by: Jason Wang <jasowang(a)redhat.com>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit bf5e0bd27f7cbaca4d52ae395bbf3715775efebd
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Sun Nov 14 17:33:25 2010 +0200
vhost: remove unused include
vhost.c does not need to know about sockets,
don't include sock.h
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 84b3cdc38cd2882d7ac3c2ae4b6faf5c199874e3
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 18:41:03 2010 -0800
can: slcan: Add missing linux/sched.h include.
drivers/net/can/slcan.c: In function 'slcan_open':
drivers/net/can/slcan.c:568: error: dereferencing pointer to incomplete type
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fe6c791570efe717946ea7b7dd50aec96b70d551
Merge: f8bf568 f198725
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 13:15:38 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
commit 393934c6b5c8d00f9d1ae20670d4a770f07a418a
Merge: 69f4aab 0a54917
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Dec 8 16:23:31 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c
commit 69f4aab1157d2a386e7ea4de77cc253629d1b4f2
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Dec 7 15:13:23 2010 -0800
ath9k_hw: warn if we cannot change the power to the chip
Suspend requires the device to be in fullsleep otherwise upon
resume the device becomes unresponsive. We need to ensure
that when we want the device to go to sleep it yields to
the request, otherwise we'll have a useless devices upon
resume. Warn when changing the power fails as we need
to look into these issues.
Cc: Paul Stewart <pstew(a)google.com>
Cc: Amod Bodas <amod.bodas(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff9f0b639f33c92a89b0799263ab625444be6ee1
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Dec 7 15:13:22 2010 -0800
ath9k: skip ATH9K_INT_TIM_TIMER when we are idle
We should not be idle when we get the ATH9K_INT_TIM_TIMER,
otherwise its a sign of something broken in our design with
our idle state machine and mac80211. Skip these and WARN once
just in case this is triggerable.
Cc: Paul Stewart <pstew(a)google.com>
Cc: Amod Bodas <amod.bodas(a)atheros.com>
signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b7e8941b2df518186d9f7679c007f6b619bb4e89
Author: Amitkumar Karwar <akarwar(a)marvell.com>
Date: Tue Dec 7 13:43:03 2010 -0800
cfg80211: add some element IDs in enum ieee80211_eid
1)WLAN_EID_BSS_COEX_2040
2)WLAN_EID_OVERLAP_BSS_SCAN_PARAM
3)WLAN_EID_EXT_CAPABILITY
Signed-off-by: Amitkumar Karwar <akarwar(a)marvell.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 692d2c0fb36c02ad07d54641c26f48e644b27fbd
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:56:00 2010 +0100
b43: rename config option for N-PHY, drop BROKEN
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 82a52043c7801f83c7387deb45bf9323af04644b
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:55:59 2010 +0100
b43: fix split of N-PHY devices into supported and not (based on PHY rev)
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit abc1f7cd531f80a8468ab654f1dfd35d58bd2490
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:55:58 2010 +0100
b43: set TMS to work with current band width for N-PHY
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c7455cf988f06ba578cc6a680392426fce382ca1
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 21:55:57 2010 +0100
b43: N-PHY: silence warnings
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2f886750118c1781d3b53268bf25519aef1d4d71
Author: Ben Greear <greearb(a)candelatech.com>
Date: Tue Dec 7 11:27:01 2010 -0800
mac80211: Show max number of probe tries in debug message.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 155180803c95c7b14b355f60431bef45116c151e
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:07 2010 +0100
b43: flush PHY writes when needed
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 755fd183b89bc8a302669b6f35cd98faee473f7a
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:06 2010 +0100
b43: N-PHY: implement own maskset
This let us avoid double addressing while still having reg check.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f00fe7f6d14ab7bbd4655f55eae71bbd73ef766d
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:05 2010 +0100
b43: N-PHY: reorder and optimize tables initialization
Order was changed in specs. For writing arrays we have designed bulk function
which makes use of auto increment and do not write table address over and over.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 857581bdf1a3b36bfd42609d6f5433bd83397127
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Dec 7 09:42:04 2010 +0100
b43: N-PHY: update init tables
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a9927ba3c5f3c5f6b0e8fa7557452335edeaf5fa
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Dec 6 21:13:49 2010 -0800
ath9k: Check for NULL sta in ath_tx_start
It can be NULL according to docs, and logging showed it
to be NULL in practice.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 80d7e403c97b712e302ec37e9beceff1dbdc9402
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Fri Nov 19 12:40:26 2010 +0100
mac80211: Apply ht_opmode changes in ieee80211_change_bss
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 50b12f597be354a5a224f05c65c54c0667e57aec
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Fri Nov 19 12:40:25 2010 +0100
cfg80211: Add new BSS attribute ht_opmode
Add a new BSS attribute to allow hostapd to set the current HT opmode.
Otherwise drivers won't be able to set up protection for HT rates in
AP mode.
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8bf5681cf15f77692c8ad8cb95d059ff7c622c9
Author: Namhyung Kim <namhyung(a)gmail.com>
Date: Tue Dec 7 04:49:06 2010 +0000
isdn/hisax: fix compiler warning on hisax_pci_tbl
Annotate hisax_pci_tbl as '__used' to fix following warning:
CC drivers/isdn/hisax/config.o
drivers/isdn/hisax/config.c:1920: warning: ‘hisax_pci_tbl’ defined but not used
Signed-off-by: Namhyung Kim <namhyung(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 920b8d913bd3d963d5c88bca160a272b71e0c95a
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Dec 7 05:05:18 2010 +0000
af_packet: fix freeing pg_vec twice on error path
It is introduced in:
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman(a)tuxdriver.com>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f6dafa95d1a48f73ab4a5b0f7dc0dcb72817e051
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Dec 7 04:26:16 2010 +0000
af_packet: eliminate pgv_to_page on some arches
Some arches don't need flush_dcache_page(), and don't implement it, so
we can eliminate pgv_to_page() calls on those arches.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 15c2d75f49189e1769c5e8f5f099d03d055c4910
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Dec 7 00:30:37 2010 +0000
net: call dev_queue_xmit_nit() after skb_dst_drop()
Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit()
after skb_dst_drop() in dev_hard_start_xmit().
When queueing a packet into af_packet socket, we drop dst anyway.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 62ab0812137ec4f9884dd7de346238841ac03283
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Dec 6 20:50:09 2010 +0000
filter: constify sk_run_filter()
sk_run_filter() doesnt write on skb, change its prototype to reflect
this.
Fix two af_packet comments.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 38f49e8801565674c424896c3dcb4228410b43a8
Author: Roger Luethi <rl(a)hellgate.ch>
Date: Mon Dec 6 00:59:40 2010 +0000
via-rhine: hardware VLAN support
This patch adds VLAN hardware support for Rhine chips.
The driver uses up to 3 additional bytes of buffer space when extracting
802.1Q headers; PKT_BUF_SZ should still be sufficient.
The initial code was provided by David Lv. I reworked it to use standard
kernel facilities. Coding style clean up mostly follows via-velocity.
Adapted to new interface for VLAN acceleration (per request of Jesse Gross).
Signed-off-by: David Lv <DavidLv(a)viatech.com.cn>
Signed-off-by: Roger Luethi <rl(a)hellgate.ch>
drivers/net/via-rhine.c | 326 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 312 insertions(+), 14 deletions(-)
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 941666c2e3e0f9f6a1cb5808d02352d445bd702c
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Dec 5 01:23:53 2010 +0000
net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
Le dimanche 05 décembre 2010 à 09:19 +0100, Eric Dumazet a écrit :
> Hmm..
>
> If somebody can explain why RTNL is held in arp_ioctl() (and therefore
> in arp_req_delete()), we might first remove RTNL use in arp_ioctl() so
> that your patch can be applied.
>
> Right now it is not good, because RTNL wont be necessarly held when you
> are going to call arp_invalidate() ?
While doing this analysis, I found a refcount bug in llc, I'll send a
patch for net-2.6
Meanwhile, here is the patch for net-next-2.6
Your patch then can be applied after mine.
Thanks
[PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
dev_getbyhwaddr() was called under RTNL.
Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use
RCU locking instead of RTNL.
Change arp_ioctl() to use RCU instead of RTNL locking.
Note: this fix a dev refcount bug in llc
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a2d4b65d477aad1fe8c7218781a031fa9cf5abfc
Merge: 01b0c5c 0491026
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 8 10:01:00 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit 01b0c5cfb23f19837650aa53495ace6d0fd7d3f8
Author: Thiago Farina <tfransosi(a)gmail.com>
Date: Sat Dec 4 15:22:46 2010 +0000
net/9p/protocol.c: Remove duplicated macros.
Use the macros already provided by kernel.h file.
Signed-off-by: Thiago Farina <tfransosi(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit aa9421041128abb4d269ee1dc502ff65fb3b7d69
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Sat Dec 4 02:31:41 2010 +0000
net: init ingress queue
The dev field of ingress queue is forgot to initialized, then NULL
pointer dereference happens in qdisc_alloc().
Move inits of tx queues to netif_alloc_netdev_queues().
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a1044e36e457fb6dbdf90ce756d578b251d99b5e
Author: Oliver Hartkopp <socketcan(a)hartkopp.net>
Date: Thu Dec 2 10:57:59 2010 +0000
can: add slcan driver for serial/USB-serial CAN adapters
This patch adds support for serial/USB-serial CAN adapters implementing the
LAWICEL ASCII protocol for CAN frame transport over serial lines.
The driver implements the SLCAN line discipline and is heavily based on the
slip.c driver. Therefore the code style remains similar to slip.c to be able
to apply changes of the SLIP driver to the SLCAN driver easily.
For more details see the slcan Kconfig entry.
Signed-off-by: Oliver Hartkopp <socketcan(a)hartkopp.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 58e481f66e31e9976558f3e4f709baf9201052fe
Author: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Date: Thu Dec 2 02:45:08 2010 +0000
atm: lanai: use kernel's '%pM' format option to print MAC
Signed-off-by: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Cc: Chas Williams <chas(a)cmf.nrl.navy.mil>
Cc: linux-atm-general(a)lists.sourceforge.net
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7659a193f94c0003dd06e9e874d19bade1a8c952
Author: Javier Cardona <javier(a)cozybit.com>
Date: Tue Dec 7 10:41:47 2010 -0800
mac80211: Fix compilation error when mesh is disabled
Wrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation
problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cae6b74d907e2abd22d496fe30417b088d3302cf
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Dec 7 21:23:16 2010 +0530
ath9k: Remove dead code in recv.c
The structure struct ieee80211_rx_status *rxs is no longer needed to be
passed to ath_rx_send_to_mac80211 function
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0ce3bcfc84900a64347b0fe1140229bd81314008
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Dec 7 21:14:15 2010 +0530
ath9k: Parse DTIM period from mac80211
With the current save power save implementation we assume a dtim period
of 1.This value is assigned based on a sanity check in the driver
eventhough we had not parsed it from mac80211.This patch obtains the actual
DTIM period from AP by parsing it from mac80211.Yet for handling
multicast traffic we may still have it as fixed rather than parsing it
from mac80211 .This does not breaks power save or anything as the sleep
duration is currently fixed in the driver.This patch may serve to improve
power save in the future by using dtim period for sleep duration and using
correct dtim period adhoc mode.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aaef24b4c9f5db726e618977b74ffef924360de5
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Dec 7 20:40:58 2010 +0530
ath9k: Properly use unlikely check macro
AUTOSLEEP feature is enabled only for AR9271 and AR9003 version
chipsets.So unlikely macro should be used only to check whether
auto-sleep feature is enabled
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit caa0a99acd2c4eb0a8d4e9caae397291e4cf743a
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Tue Dec 7 16:32:02 2010 +0530
ath9k_htc: Fix panic on FW download failure
Use the correct error condition exit in case firmware download
fails for some reason. Not doing so results in a panic:
usb 1-3: ath9k_htc: Transferred FW: ar9271.fw, size: 51280
usb 1-3: ath9k_htc: Firmware - ar9271.fw download failed
usb 1-3: ath9k_htc: Target is unresponsive
Failed to initialize the device
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
Pid: 2823, comm: insmod Tainted: G W 2.6.37-rc4-wl #11
Call Trace:
[<ffffffff81090d7e>] __lock_acquire+0xe3e/0x1d00
[<ffffffff813a9f14>] ? restore_args+0x0/0x30
[<ffffffff81058af1>] ? vprintk+0x321/0x500
[<ffffffff81092290>] lock_acquire+0xa0/0x190
[<ffffffffa02a0eac>] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffff813a8ea8>] _raw_spin_lock_irq+0x48/0x60
[<ffffffffa02a0eac>] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffff813a53fd>] ? printk+0x3c/0x3f
[<ffffffffa02a0eac>] usb_kill_anchored_urbs+0x1c/0x80 [usbcore]
[<ffffffffa0055388>] ath9k_hif_usb_dealloc_urbs+0x18/0x40 [ath9k_htc]
[<ffffffffa00557d7>] ath9k_hif_usb_probe+0x227/0x3d0 [ath9k_htc]
[<ffffffffa02a56ac>] usb_probe_interface+0x10c/0x210 [usbcore]
[<ffffffff812ae826>] driver_probe_device+0x96/0x1c0
[<ffffffff812ae9f3>] __driver_attach+0xa3/0xb0
[<ffffffff812ae950>] ? __driver_attach+0x0/0xb0
[<ffffffff812ad6ae>] bus_for_each_dev+0x5e/0x90
[<ffffffff812ae4c9>] driver_attach+0x19/0x20
[<ffffffff812ae038>] bus_add_driver+0x168/0x320
[<ffffffff812aec71>] driver_register+0x71/0x140
[<ffffffff811fc338>] ? __raw_spin_lock_init+0x38/0x70
[<ffffffffa02a438c>] usb_register_driver+0xdc/0x190 [usbcore]
[<ffffffffa0063000>] ? ath9k_htc_init+0x0/0x4f [ath9k_htc]
[<ffffffffa005599e>] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc]
[<ffffffffa006302b>] ath9k_htc_init+0x2b/0x4f [ath9k_htc]
[<ffffffff8100212f>] do_one_initcall+0x3f/0x180
[<ffffffff8109ef9b>] sys_init_module+0xbb/0x200
[<ffffffff8100bf52>] system_call_fastpath+0x16/0x1b
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 692d6b175b392512881ab374567e900fc825d487
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Tue Dec 7 16:31:54 2010 +0530
ath9k_htc: Add support for handling TX power configuration
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0b5ead91cda63e0db964dadc77601233434f60cb
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Tue Dec 7 16:31:38 2010 +0530
ath9k_htc: Cleanup device identification
ath.ko is a common module shared between ath5k, ar9170usb, ath9k and ath9k_htc.
Adding driver specific data to the shared structure would impact all the
drivers. Handling USB device recognition for devices specific to ath9k_htc
can be handled within the driver itself.
Also, AR7010 refers to the processor used in both AR9280/AR9287 based
devices. Rename the device enumerations accordingly.
While at it, check properly for the bus type when choosing the EEPROM
base address for UB95.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c658e5db01117bf2a321a9a782754dd5b10e2f15
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Dec 7 04:40:18 2010 +0100
mac80211: fix a compiler warning
net/mac80211/mlme.c: In function 'ieee80211_sta_work':
net/mac80211/mlme.c:1981: warning: too many arguments for format
Introduced by commit 04ac3c0ee2c773c321ec472d892635a20556f34d
("mac80211: speed up AP probing using nullfunc frames").
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 22d8d9f81b8b054df2f7f82daffcb71608f411e4
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Dec 7 11:08:12 2010 +0900
ath5k: Use capabilities information for the number of TX queues
One thing I missed in my WME series: Older hardware does not have enough
hardware queues to support WME. In this case we just set up one data queue. Use
the capability information to decide how many queues to set up.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d7fd1b50a51be3fe6554fbab8953fa8a3ff4009b
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Dec 6 13:13:07 2010 -0800
ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE.
This decreases spammage in the log. A single line message
will still be printed, so users can be aware that problem
exists.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Acked-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1435894dcd263fdbdd5e1ea2a684289dff187c34
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:28:00 2010 -0800
ath9k: Add device id of AR9485 to pci table
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a95f1600081211433c5ff6f3668061c821552e9f
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:59 2010 -0800
ath9k_hw: Disable MRC CCK for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 11441fb8b700bd782ae72d3dd87453fc5bc2ff12
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:58 2010 -0800
ath9k_hw: Setup paprd only for supported chains
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7090ad1416d0311677c43728494c6028aa2436b6
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:57 2010 -0800
ath9k_hw: Program appropriate register for temperature compensation cal for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 858b7e36e82cc03cb77b64f096b64446a24a346a
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:56 2010 -0800
ath9k_hw: Add IQ cal changes for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 31faff815bd9d87c370f799dff03948ed362d260
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:55 2010 -0800
ath9k_hw: Define IQcal correction coefficient registers using index
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6559e83ebd2cac06c54ebb2b7f635cf2e434f25c
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:54 2010 -0800
ath9k_hw: Program appropriate chianmask for AR9485 before starting AGC/IQ cal
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5f139eba4174d9a3343efc7cfb8a0a9cb184c647
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:53 2010 -0800
ath9k_hw: Configure power control only for the supported chains
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dd040f76cef0cc977b83e905a16b68d41322b735
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:52 2010 -0800
ath9k_hw: Read and configure turnning caps to regulate freq accuracy
Right now it is done for only AR9485, will be done for ar9003 also
after proper testing.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ab09b5b4beda8b33a117bf6fbbb2b5aa8f566129
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Tue Dec 7 02:20:39 2010 -0800
ath9k_hw: Configure internal regulator for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 47e84dfb411fcaa51e12d94ab82570ec3aa86e32
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:49 2010 -0800
ath9k_hw: Read and configure antenna diversity control for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9936e65fae6d95c2acc2438c60a8f4908130530e
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:48 2010 -0800
ath9k_hw: Configure xpa bias level for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d9a2545ac713e26ab8c8eee741d2da1626cebd6e
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:47 2010 -0800
ath9k: Read spur channel information from eeprom for AR9485
Also spur channel count and range is different for AR9485.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 272ceba892208013a45847276a00ccae54e2b94a
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:46 2010 -0800
ath9k_hw: Add a helper function to get spur channel pointer from cal data for AR9003 family
This helper function would be used for AR9485.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 85dd0921e686ed2f0283cef358a91ecaa36ccc8f
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:45 2010 -0800
ath9k_hw: Find chansel of AR_PHY_65NM_CH0_SYNTH7 for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d09b17f73fd8f475f33d0b8311d7b5a0bed67c67
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:44 2010 -0800
ath9k: Configure pll control for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 47c80de62e9d6d262a829502d689a8b56add8d3d
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:43 2010 -0800
ath9k_hw: Find the maximum number of chains that hw supports
Have it in ah->caps. This will be used during various
calibrations.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8060e169e02fe855f5533b5ef6af1f23ae2db0c4
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:42 2010 -0800
ath9k: Enable extended synch for AR9485 to fix L0s recovery issue
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7f1c7a6ac57ff0482219aa3f62eb9d0f8fe65867
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:41 2010 -0800
ath9k: Disable TX STBC for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 784ad50324ec531fa4ab22586fe305657cc6e307
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:40 2010 -0800
ath9k_hw: Disable LDPC for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 60e0c3a782f9060327751492dac949210154759b
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:39 2010 -0800
ath9k_hw: Eeeprom changes for AR9485
Calibration data are stored at 4k address (0xfff). The cal data
for AR9485 is not compressed so its lengh can exceed 1024 limit,
take care of that.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff48ba464e3503149657c60d46e8f4e9b4ed27fa
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:38 2010 -0800
ath9k_hw: Initialize tx/rx gain table from initvals.h for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c88457eb83fb6db7a3286a685ecc6e33a7aac49d
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:37 2010 -0800
ath9k_hw: Initialize mode registers for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3050c9146b2a4c98a916192fac2867c0023ec2b1
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:36 2010 -0800
ath9k_hw: Enable hw initialization for AR9485
Also make it a supported mac
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d9c803e1864d563b07382eb1bb8979cd70b1001e
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:35 2010 -0800
ath9k_hw: Add initvals.h for AR9485
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3bbb780cca79dfe0200d33afb95a8990acde65b9
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Mon Dec 6 04:27:34 2010 -0800
ath9k_hw: Define hw version macros for AR9485
AR9485 is a single chain and single band (2.4 Ghz) chip.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b7555ec7c604f2f00e432579dac29df5ce525433
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Dec 7 14:13:49 2010 -0500
ath5k: remove MODULE_VERSION
Since this is updated manually and sporadically, it is fairly useless
anyway.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a1cbc7a88985976267a851a2e1080578711b3b0d
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:38 2010 -0800
ath: Fix ath_dbg access beyond array bound
ar9300RateSize is not necessarily a power of 4.
Change ar9003_hw_set_target_power_eeprom
to print the targetPowerValT2 array one per line.
ath9k_hw_ar9300_set_txpower repeated the output 4 times per line,
change it to print the targetPowerValT2 value one per line.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 226afe68fdbd1aa3680158aca0a3631cbd019626
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:37 2010 -0800
ath: Convert ath_print to ath_dbg
Remove ath/debug.h and the includes of these files.
Coalesce long formats.
Correct a few misspellings and missing "\n"s from these logging messages.
Remove unnecessary trailing space before a newline.
Remove ARRAY_SIZE casts, use printf type %zu
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3800276a40751539a920ef8e0537ef2e19126799
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:36 2010 -0800
ath: Convert ath_print(.., ATH_DBG_FATAL to ath_err
So these errors are always emitted at KERN_ERR level.
Remove ARRAY_SIZE casts, use printf type %zu
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 21a99f934949807dc0c9dc7642bbf0081b7582f9
Author: Joe Perches <joe(a)perches.com>
Date: Thu Dec 2 19:12:35 2010 -0800
ath: Add and use ath_printk and ath_<level>
Add ath_printk and ath_<level> similar to
dev_printk and dev_<level> from device.h
This allows a more gradual rename of ath_print
to to ath_dbg or perhaps ath_debug.
This basically removes debug.h leaving
only an #define ath_printk ath_dbg
there and moving all the ATH_DBG_<foo>
enums to ath.h
I do not think there's much purpose for struct
ath_common * being passed to the ath_printk
functions, but perhaps there might be.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0ab82b04ac83a05bda3ef8499f415fc6fd6ee206
Author: Eliad Peller <eliad(a)wizery.com>
Date: Fri Dec 3 02:16:23 2010 +0200
mac80211: fix dynamic-ps/pm_qos magic numbers
mac80211 uses pm_qos (/dev/network_latency) in order to determine the
dynamic ps timeout (or disable the dynamic-ps at all in some cases).
commit ff616381 added a comparison for the current network_latency
against one high value (1900ms), and against the default value
(2000sec, rather than the commented 2sec).
however, the representation of 1900ms was incorrect:
1900ms = 1900000us ( != 1900000000 )
fix it by using USEC_TO_MSEC/SEC consts.
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 329b32fedc94fd9158f1635ac64f4ae6a00d374c
Author: David Kilroy <kilroyd(a)googlemail.com>
Date: Thu Dec 2 18:19:21 2010 +0000
orinoco: allow IW_AUTH_MFP to pass through
The card doesn't support MFP, so silently accept DISABLED and OPTIONAL
settings.
This avoids the following failure in wpa_supplicant logs:
State: SCANNING -> ASSOCIATING
wpa_driver_wext_set_operstate: operstate 0->0 (DORMANT)
netlink: Operstate: linkmode=-1, operstate=5
wpa_driver_wext_associate
wpa_driver_wext_set_drop_unencrypted
wpa_driver_wext_set_psk
wpa_driver_wext_associate: assoc failed because set_auth_param(IW_AUTH_MFP) failed
Association request to the driver failed
Signed-off by: David Kilroy <kilroyd(a)googlemail.com>
Reported by: Giacomo Comes <comes(a)naic.edu>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 541a45a142df281c974d74eac2066138fc107b23
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 19:12:43 2010 +0900
nl80211/mac80211: Report signal average
Extend nl80211 to report an exponential weighted moving average (EWMA) of the
signal value. Since the signal value usually fluctuates between different
packets, an average can be more useful than the value of the last packet.
This uses the recently added generic EWMA library function.
--
v2: fix ABI breakage and change factor to be a power of 2.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c39d35ebffeea5996a6f8fd8430fae9acfb8aeaf
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Tue Dec 7 19:11:26 2010 +0000
sfc: Generalise filter spec initialisation
Move search_depth arrays into per-table state.
Define initialisation function efx_filter_init_rx() which sets
everything apart from the match fields.
Define efx_filter_set_{ipv4_local,ipv4_full,eth_local}() to set the
match fields. This allows some simplification of callers and later
support for additional protocols and more flexible matching using
multiple calls to these functions.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 8891681af928f1da795cd4bd59043e5e0fadd6c8
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Tue Dec 7 19:02:27 2010 +0000
sfc: Remove filter table IDs from filter functions
The separation between filter tables is largely an internal detail
and it may be removed in future hardware. To prepare for that:
- Merge table ID with filter index to make an opaque filter ID
- Wrap efx_filter_table_clear() with a function that clears filters
from both RX tables, which is all that the current caller requires
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit ac33ac610dc613b2b1c938f8b61eef651ab72563
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Tue Dec 7 18:29:52 2010 +0000
sfc: Log start and end of ethtool self-test at INFO level
Add message at start of self-test and increase log level of message at
end of self-test, so that any other messages produced during the
test are clearly associated with it.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 04910265078f08a73208beab70ed2a3cce4a919f
Author: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Date: Sat Dec 4 13:39:13 2010 +0100
dccp qpolicy: Parameter checking of cmsg qpolicy parameters
Ensure that cmsg->cmsg_type value is valid for qpolicy
that is currently in use.
Signed-off-by: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 871a2c16c21b988688b4ab1a78eadd969765c0a3
Author: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Date: Sat Dec 4 13:38:01 2010 +0100
dccp: Policy-based packet dequeueing infrastructure
This patch adds a generic infrastructure for policy-based dequeueing of
TX packets and provides two policies:
* a simple FIFO policy (which is the default) and
* a priority based policy (set via socket options).
Both policies honour the tx_qlen sysctl for the maximum size of the write
queue (can be overridden via socket options).
The priority policy uses skb->priority internally to assign an u32 priority
identifier, using the same ranking as SO_PRIORITY. The skb->priority field
is set to 0 when the packet leaves DCCP. The priority is supplied as ancillary
data using cmsg(3), the patch also provides the requisite parsing routines.
Signed-off-by: Tomasz Grobelny <tomasz(a)grobelny.oswiecenia.net>
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit cfa969e385a23e4c85f50e0ed5de25a2e18bf9d4
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Dec 6 20:45:28 2010 -0800
Revert "ehea: Use the standard logging functions"
This reverts commit 539995d18649023199986424d140f1d620372ce5.
As reported by Stephen Rothwell, this breaks the build.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cd38557d78554fd4318fe448f728a8d7ff1cbabb
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Nov 15 23:53:11 2010 +0000
sfc: Use TX push whenever adding descriptors to an empty queue
Whenever we add DMA descriptors to a TX ring and update the ring
pointer, the TX DMA engine must first read the new DMA descriptors and
then start reading packet data. However, all released Solarflare 10G
controllers have a 'TX push' feature that allows us to reduce latency
by writing the first new DMA descriptor along with the pointer update.
This is only useful when the queue is empty. The hardware should
ignore the pushed descriptor if the queue is not empty, but this check
is buggy, so we must do it in software.
In order to tell whether a TX queue is empty, we need to compare the
previous transmission count (write_count) and completion count
(read_count). However, if we do that every time we update the ring
pointer then read_count may ping-pong between the caches of two CPUs
running the transmission and completion paths for the queue.
Therefore, we split the check for an empty queue between the
completion path and the transmission path:
- Add an empty_read_count field representing a point at which the
completion path saw the TX queue as empty.
- Add an old_write_count field for use on the completion path.
- On the completion path, whenever read_count reaches or passes
old_write_count the TX queue may be empty. We then read
write_count, set empty_read_count if read_count == write_count,
and update old_write_count.
- On the transmission path, we read empty_read_count. If it's set, we
compare it with the value of write_count before the current set of
descriptors was added. If they match, the queue really is empty and
we can use TX push.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit e506147271229d6c53b42c6a9897db67b5cfdb6d
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:58:41 2010 +0000
sfc: Remove locking from implementation of efx_writeo_paged()
It is not necessary to serialise writes to the paged 128-bit
registers. However, if we don't then we must always write the last
dword separately, not as part of a qword write.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 1a29cc40115c011895143c5f8278dee49423d5df
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:55:33 2010 +0000
sfc: Add compile-time checks for correctness of paged register writes
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 494bdf1b0fd58688d055f1b66c34b0844dcfc1fa
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:55:18 2010 +0000
sfc: Remove redundant memory barriers between MMIOs
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 9f2f6cd07a09bc0af1f2950189e426569561d1e6
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:55:00 2010 +0000
sfc: Expand/correct comments on collector behaviour and function usage
Document exactly which registers and functions have special behaviour,
and why races on writes to descriptor pointers are safe.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 51c56f40ef41ca780ff001d59727eda03fa39374
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Wed Nov 10 18:46:40 2010 +0000
sfc: Use ACCESS_ONCE when copying efx_tx_queue::read_count
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit ab28c12a8e6fea875b6757052e211772f62fa771
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Mon Dec 6 22:53:15 2010 +0000
sfc: Reorder struct efx_nic to separate fields by volatility
Place the regularly updated fields (locks, MAC stats, etc.) on a
separate cache-line from fields which are mostly constant. This
should reduce cache misses for access to the latter on the data path.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
commit 40fe7d88ab3eb711b307fab1b92aa6870914c975
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 2 07:22:05 2010 +0000
net: cris/eth_v10: Use net_device_stats from struct net_device_stats
struct net_device has its own struct net_device_stats member, so use
this one instead of a private copy in struct net_local.
Note: This patch was not even compile tested.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b27d50a9ff5cf2775b7a4daf571a0cc72d013b9c
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 2 07:20:39 2010 +0000
net: emaclite: Omit private ndo_get_stats function
xemaclite_get_stats() just returns dev->stats so we can leave it out
alltogether and let dev_get_stats() do the job.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e176bbc5893bef36a0909de31dea97865660a7c9
Author: Tobias Klauser <tklauser(a)distanz.ch>
Date: Thu Dec 2 07:20:05 2010 +0000
net: am79c961a: Omit private ndo_get_stats function
am79c961_getstats() just returns dev->stats so we can leave it out
alltogether and let dev_get_stats() do the job.
Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch>
Acked-by: Russell King <rmk+kernel(a)arm.linux.org.uk>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9f91170773d852e65e4fc36e1f8173ce614f62e1
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 13:24:05 2010 +0000
ixgbe: fix enum type mismatch on disable laser
Fixes a recent bug on the patch (c6ecf39a10ceec3e97096e2a8d3eadcecd593422)
that disabled the laser on ifconfig down. Compilers were seeing a enum
mismatch.
Signed-off-by Don Skidmore <donald.c.skidmore(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a7f5a5fcd9f13afd3471a0de8c1fdaa8f989497c
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 13:23:30 2010 +0000
ixgbe: fix for link failure on SFP+ DA cables
This patch helps prevent FW/SW semaphore collision from leading
to link establishment failure. The collision might mess up the
PHY registers so we reset the PHY. However there are SFI/KR areas
in the PHY that are not reset with a Reset_AN so we need to change
LMS to reset it. Also wait until AN state machine is AN_GOOD
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8917a3c0b7d1557548f50bfe3f0e18e0354e38f6
Author: David Shwatrz <dshwatrz(a)gmail.com>
Date: Thu Dec 2 09:01:55 2010 +0000
Fix a typo in datagram.c and sctp/socket.c.
Hi,
This patch fixes a typo in net/core/datagram.c and in net/sctp/socket.c
Regards,
David Shwartz
Signed-off-by: David Shwartz <dshwatrz(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 22de94de7de78b8de2fb1f2df5aa85b5556cfcfd
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Dec 3 15:41:48 2010 +0100
iwlwifi: jiffies based tx queues watchdog
This patch replace monitor/recover timer by watchdog based on time
stamp. New code allow to discover hangs more precisely.
Timeout values are currently doubled monitoring period values of
previous timer. This have to be tuned based of firmware timing
capabilities.
Tested on 3945, 4965, 5300, 6300.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit abc471dc31be15f9fee5ec77f25d31b927d334b9
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Dec 3 15:41:47 2010 +0100
iwl3945: prevent too frequent firmware resets
Similarly like on iwlagn, initialize reset duration on iwl3945 to prevent
too frequent firmware resets.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 29cbe68c516a48a9a88b3226878570c6cbd83c02
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:44 2010 +0100
cfg80211/mac80211: add mesh join/leave commands
Instead of tying mesh activity to interface up,
add join and leave commands for mesh. Since we
must be backward compatible, let cfg80211 handle
joining a mesh if a mesh ID was pre-configured
when the device goes up.
Note that this therefore must modify mac80211 as
well since mac80211 needs to lose the logic to
start the mesh on interface up.
We now allow querying mesh parameters before the
mesh is connected, which simply returns defaults.
Setting them (internally renamed to "update") is
only allowed while connected. Specify them with
the new mesh join command instead where needed.
In mac80211, beaconing must now also follow the
mesh enabled/not enabled state, which is done
by testing the mesh ID.
Signed-off-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bd90fdcc5fbd99a2a778999610420cf793bd1be2
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:43 2010 +0100
nl80211: refactor mesh parameter parsing
I'm going to need this in a new place later.
Tested-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f9e10ce4cf86945eb5efcab31284c971877ed012
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:42 2010 +0100
cfg80211: require add_virtual_intf to return new dev
cfg80211 used to do all its bookkeeping in
the notifier, but some new stuff will have
to use local variables so make the callback
return the netdev pointer.
Tested-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 09b174702601079c3a04806754be30ffbd70db4d
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Fri Dec 3 09:20:41 2010 +0100
mac80211: move mesh filter adjusting
Logically, the filter adjusting belongs with
starting/stopping mesh, not interface up/down,
so move it there.
Tested-by: Javier Cardona <javier(a)cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 45904f21655cf4f0ae7d0fab5906fe51bf56ecf4
Author: Javier Cardona <javier(a)cozybit.com>
Date: Fri Dec 3 09:20:40 2010 +0100
nl80211/mac80211: define and allow configuring mesh element TTL
The TTL in path selection information elements is different from
the mesh ttl used in mesh data frames. Version 7.03 of the 11s
draft calls this ttl 'Element TTL'.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b9e61f11f47035e3b4545b51fb547fef48eb3096
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:12:39 2010 +0200
ath5k: Include tx ack reporting on hw flags
* Since we report tx acks to the protocol stack, add the needed
flag to hw_flags. This way we'll also use the new AP probing mechanism.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f0e134a53ad95ba7a393b299ae56c9bdcaed8aec
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:09:38 2010 +0200
ath5k: Fix reporting of RX dma stop failure
* Correctly report failure to stop RX DMA
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 344b54b971bc5578281264fb6896e13b4120352b
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:07:13 2010 +0200
ath5k: Disable ANI during reset
* Stop ANI durring reset to prevent false PHY error reports
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 19252ecb672d3f35959c576d1d26b9aca350f5bf
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:05:19 2010 +0200
ath5k: Always free tx buffers before reset
* Always free tx buffers before reset, since we also empty hw queues.
If we don't and a queue gets stuck, we'll never decrease txq_len and sw
will keep thinking the queue is still stuck even after reset.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d5311e4e8272fd398fc1cf278f12fd6dee4074b
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Dec 1 20:46:24 2010 +0000
filter: add a security check at install time
We added some security checks in commit 57fe93b374a6
(filter: make sure filters dont read uninitialized memory) to close a
potential leak of kernel information to user.
This added a potential extra cost at run time, while we can perform a
check of the filter itself, to make sure a malicious user doesnt try to
abuse us.
This patch adds a check_loads() function, whole unique purpose is to
make this check, allocating a temporary array of mask. We scan the
filter and propagate a bitmask information, telling us if a load M(K) is
allowed because a previous store M(K) is guaranteed. (So that
sk_run_filter() can possibly not read unitialized memory)
Note: this can uncover application bug, denying a filter attach,
previously allowed.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Dan Rosenberg <drosenberg(a)vsecurity.com>
Cc: Changli Gao <xiaosuo(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Wed Dec 1 20:07:31 2010 +0000
net: arp: use assignment
Only when dont_send is 0, arp_filter() is consulted, so we can simply
assign the return value of arp_filter() to dont_send instead.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6464281161e46254ac39505ad41d21dbe7d1738f
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Wed Dec 1 01:04:17 2010 +0000
be2net: Handle out of buffer completions for lancer
If Lancer chip does not have posted RX buffers, it posts an RX completion entry
with the same frag_index as the last valid completion. The Error bit is also
set. In BE, a flush completion is indicated with a zero value for num_rcvd in
the completion.
Such completions don't carry any data and are not processed.
This patch refactors code to handle both cases with the same code.
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar(a)emulex.com>
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 359a972fae84242efa26b86bf09c3ac3784405ba
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Wed Dec 1 01:03:36 2010 +0000
be2net: FW init cmd fix for lancer
Lancer can use the same pattern as BE to indicate a driver load
to the FW.
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar(a)emulex.com>
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 63657b9c319588cd35ed869e19cc6255dbef0d20
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Wed Dec 1 01:02:28 2010 +0000
be2net: Fix be_dev_family_check() return value check
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c56b4d90123b77e29a91b9b96bb791f929139d8e
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Wed Dec 1 02:52:57 2010 +0000
af_packet: remove pgv.flags
As we can check if an address is vmalloc address with is_vmalloc_addr(),
we remove pgv.flags. Then we may get more pg_vecs.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0af55bb58f8fa7865004ac48d16affe125ac1b7f
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Wed Dec 1 02:52:20 2010 +0000
af_packet: use vmalloc_to_page() instead for the addresss returned by vmalloc()
The following commit causes the pgv->buffer may point to the memory
returned by vmalloc(). And we can't use virt_to_page() for the vmalloc
address.
This patch introduces a new inline function pgv_to_page(), which calls
vmalloc_to_page() for the vmalloc address, and virt_to_page() for the
__get_free_pages address.
We used to increase page pointer to get the next page at the next page
address, after Neil's patch, it is wrong, as the physical address may
be not continuous. This patch also fixes this issue.
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman(a)tuxdriver.com>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f7fce74e387e0563e5a165704664aa5ee8b2f48b
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Dec 1 06:03:06 2010 +0000
net: kill an RCU warning in inet_fill_link_af()
commits 9f0f7272 (ipv4: AF_INET link address family) and cf7afbfeb8c
(rtnl: make link af-specific updates atomic) used incorrect
__in_dev_get_rcu() in RTNL protected contexts, triggering PROVE_RCU
warnings.
Switch to __in_dev_get_rtnl(), wich is more appropriate, since we hold
RTNL.
Based on a report and initial patch from Amerigo Wang.
Reported-by: Amerigo Wang <amwang(a)redhat.com>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Thomas Graf <tgraf(a)infradead.org>
Reviewed-by: WANG Cong <amwang(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 06a9701f4b3e3381dea96fee1cc8a3bb41b0a1f1
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Dec 1 01:37:42 2010 +0000
__in_dev_get_rtnl() can use rtnl_dereference()
If caller holds RTNL, we dont need a memory barrier
(smp_read_barrier_depends) included in rcu_dereference().
Just use rtnl_dereference() to properly document the assertions.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit da2033c282264bfba4e339b7cb3df62adb5c5fc8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 30 21:45:56 2010 +0000
filter: add SKF_AD_RXHASH and SKF_AD_CPU
Add SKF_AD_RXHASH and SKF_AD_CPU to filter ancillary mechanism,
to be able to build advanced filters.
This can help spreading packets on several sockets with a fast
selection, after RPS dispatch to N cpus for example, or to catch a
percentage of flows in one queue.
tcpdump -s 500 "cpu = 1" :
[0] ld CPU
[1] jeq #1 jt 2 jf 3
[2] ret #500
[3] ret #0
# take 12.5 % of flows (average)
tcpdump -s 1000 "rxhash & 7 = 2" :
[0] ld RXHASH
[1] and #7
[2] jeq #2 jt 3 jf 4
[3] ret #1000
[4] ret #0
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Rui <wirelesser(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 539995d18649023199986424d140f1d620372ce5
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 30 08:18:44 2010 +0000
ehea: Use the standard logging functions
Remove ehea_error, ehea_info and ehea_debug macros.
Use pr_fmt, pr_<level>, netdev_<level> and netif_<level> as appropriate.
Fix messages to use trailing "\n", some messages had an extra one
as the old ehea_<level> macros added a trailing "\n".
Coalesced long format strings.
Uncompiled/untested.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Breno Leitao<leitao(a)linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7903264402546f45f9bac8ad2bfdb00d00eb124a
Author: Michał Mirosław <mirq-linux(a)rere.qmqm.pl>
Date: Tue Nov 30 06:38:00 2010 +0000
net: Fix too optimistic NETIF_F_HW_CSUM features
NETIF_F_HW_CSUM is a superset of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM, but
some drivers miss the difference. Fix this and also fix UFO dependency
on checksumming offload as it makes the same mistake in assumptions.
Signed-off-by: Michał Mirosław <mirq-linux(a)rere.qmqm.pl>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 900d495a189dc3ff5952b98a77d18e3018f8286c
Author: Alexey Orishko <alexey.orishko(a)gmail.com>
Date: Mon Nov 29 23:23:28 2010 +0000
USB CDC NCM host driver
The patch provides USB CDC NCM host driver support in the Linux Kernel.
Changes:
drivers/net/usb/cdc_ncm.c:
- initial submission of the CDC NCM host driver;
- verified on Intel 32/64 bit, Intel Atom, ST-Ericsson U8500 (ARM)
- throughput measured over 100 Mbits duplex;
- driver supports 16-bit NTB format only, but it is more than enough for
transfers up to 64K;
- driver can handle up to 32 datagrams in received NTB;
- timer is used to collect several packets in Tx direction
drivers/net/usb/Kconfig:
- a new entry to compile CDC NCM host driver
drivers/net/usb/Makefile:
- a new entry to compile CDC NCM host driver
Signed-off-by: Alexey Orishko <alexey.orishko(a)stericsson.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 073285fd392f6dc901da7c698d46e1e2a7e26436
Author: Alexey Orishko <alexey.orishko(a)gmail.com>
Date: Mon Nov 29 23:23:27 2010 +0000
usbnet: changes for upcoming cdc_ncm driver
Changes:
include/linux/usb/usbnet.h:
- a new flag to indicate driver's capability to accumulate IP packets in Tx
direction and extract several packets from single skb in Rx direction.
drivers/net/usb/usbnet.c:
- the procedure of counting packets in usbnet was updated due to the
accumulating of IP packets in the driver
- no short packets are sent if indicated by the flag in driver_info
structure
Signed-off-by: Alexey Orishko <alexey.orishko(a)stericsson.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d84938c9be85f4738a350ef44210789fef915cb7
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Fri Dec 3 06:03:00 2010 +0200
ath5k: Always write tx powertable on hw
* By skipping tx power table calibration we also skip setting
tx power table on hw. Make sure we always write tx power table
on hw since it gets cleared on reset.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 04ac3c0ee2c773c321ec472d892635a20556f34d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 21:01:08 2010 +0100
mac80211: speed up AP probing using nullfunc frames
If the nullfunc frame used to probe the AP was not acked, there is no point
in waiting for the probe timeout, so advance to the next try (or disconnect)
immediately.
If we do reach the probe timeout without having received a tx status, the
connection is probably really bad and worth disconnecting.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 75706d0e9d19601534446982b70102bb9327169b
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 21:01:07 2010 +0100
mac80211: remove a redundant check
ieee80211_is_nullfunc() implies ieee80211_is_data()
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit af5568843594fb71055debe36e521fa8072fcecc
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 19:50:37 2010 +0900
lib: Improve EWMA efficiency by using bitshifts
Using bitshifts instead of division and multiplication should improve
performance. That requires weight and factor to be powers of two, but i think
this is something we can live with.
Thanks to Peter Zijlstra for the improved formula!
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
--
v2: use log2.h functions
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5dcc03fe29537edd7819f5b121bf3d779693f37b
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 19:12:31 2010 +0900
ath5k: Use EWMA factor of 1024 instead of 1000
This prepares the only place which uses the EWMA library so far for the
performance improved implementation coming up, which requires factor and
weight to be a power of two.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9a10a870e09f1fd50fd024d55232b4b72cf4e387
Author: Joe Perches <joe(a)perches.com>
Date: Wed Dec 1 09:37:55 2010 -0800
MAINTAINERS: Add ATH GENERIC UTILITIES
This file pattern is not currently shown as maintained
by atheros. Perhaps it should be?
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c1ce5a74d113f221d40625bd3ad83df2db2695b7
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Wed Dec 1 16:34:45 2010 +0100
mac80211: Update last_tx_rate only for data frames
The last_tx_rate field was also updated for non-data frames that are
often sent with a lower rate (for example management frames at 1 Mbps).
This is confusing when the data rate is actually much higher.
Hence, only update the last_tx_rate field with tx rate information
gathered from last data frames.
If the rate control algorithm filled in txrc.reported_rate we don't need
to verify this information.
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5f79ed3b1aa7af260c82ba714b90907070aeca7a
Merge: 09f921f 9f28ebc
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Dec 6 15:52:27 2010 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
commit f435d9eea01309aa7b6c1f134569a7b5957918ae
Merge: 5ee4937 09f921f
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Dec 6 15:35:34 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 5ee493767352314893520ac40aec5bb07d0147e0
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:54 2010 +0000
tg3: Update version to 3.116
This patch updates the tg3 version to 3.116.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a386b9011a4687470e6168e2f2a08c468f25f72f
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:53 2010 +0000
tg3: Relax EEE thresholds
The hardware defaults to fairly aggressive EEE thresholds. While there
appear to be no ill effects, this patch relaxes them, just as a
precaution.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a6b68dab169e2a51e59f43504f1279cbc2afcde8
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:52 2010 +0000
tg3: Minor EEE code tweaks
The first hunk of this patch makes sure that the driver checks for the
appropriate preconditions before checking if EEE negotiation succeeded.
More specifically the link needs to be full duplex for EEE to be
enabled.
The second and third hunks of this patch fix a bug where the eee
advertisement register would be programmed with extra bits set.
The fourth hunk of this patch makes sure the EEE capability flag is not
set for 5718 A0 devices and that the device is not a serdes device.
None of these modifications are strictly necessary. The driver /
hardware still does the right thing. They are submitted primarily for
correctness.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 699c019385fcb13498a5a3a8bd368f04f1d4a223
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:51 2010 +0000
tg3: Fix 57765 EEE support
EEE support in the 57765 internal phy will not enable after a phy reset
unless it sees that EEE is supported in the MAC. This patch moves the
code that programs the CPMU EEE registers to a place before the phy
reset.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3110f5f5545a645c50ef66b1f705d08dfd1df404
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:50 2010 +0000
tg3: Move EEE definitions into mdio.h
In commit 52b02d04c801fff51ca49ad033210846d1713253 entitled "tg3: Add
EEE support", Ben Hutchings had commented that the EEE advertisement
register will be in a standard location. This patch moves that
definition into mdio.h and changes the code to use it.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8fc2f9956127d2b85280c07e69aeb08b9bd85150
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Mon Dec 6 08:28:49 2010 +0000
tg3: Raise the jumbo frame BD flag threshold
The current transmit routines set the jumbo frame BD flag too
aggressively. This can reduce performance for common cases. This patch
raises the jumbo flag threshold to 1518, up from 1500.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Benjamin Li <benli(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca44ac386181ba710a9ab6db900d6c1e5451b366
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Mon Nov 29 22:48:46 2010 +0000
net: don't reallocate skb->head unless the current one hasn't the needed extra size or is shared
skb head being allocated by kmalloc(), it might be larger than what
actually requested because of discrete kmem caches sizes. Before
reallocating a new skb head, check if the current one has the needed
extra size.
Do this check only if skb head is not shared.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Cc: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 289700dbc40c78741f17e2304ed4ac0db3c3afd3
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:32:58 2010 +0000
ixgbe: add support for new format of PBA numbers
The new PBA format is stored as a string. This patch allows the
driver to support both the old and new format.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dbffcb210f45239ea530e0a71470e48abefe4210
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:32:34 2010 +0000
ixgbe: add support for 82599 FCoE SKU
Add both NIC and backplane support for FCoE enabled devices IDs.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0b077feac00a8b7b0afbab3274b2e74b749bc917
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:32:13 2010 +0000
ixgbe: add WOL support for SFP+ subdevice
This patch will add wake on LAN support to the dev/sub_dev 10FB 11A9. This
will also include ixgbe ethtool support for this device.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c6ecf39a10ceec3e97096e2a8d3eadcecd593422
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Fri Dec 3 03:31:51 2010 +0000
ixgbe: fix link behavior for SFP+ when driver is brought down
We have had several requests to have ifconfig down command disable
the SFP+ laser and thus make link go down. Likewise on ifconfig up
the laser would be enabled and link would come up. This patch enables
that behavior.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e4d849b8113b0cf7b6ebfa9ee4c47bd514ea49d3
Author: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Date: Thu Dec 2 20:42:08 2010 +0000
qlcnic: Updated driver version to 5.0.13
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 40839129f77903cbbb7f232e2e2ab08dfe4a4f8d
Author: Sritej Velaga <sritej.velaga(a)qlogic.com>
Date: Thu Dec 2 20:41:56 2010 +0000
qlcnic: LICENSE file for qlcnic
Signed-off-by: Sritej Velaga <sritej.velaga(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 091056b2ad04df09a3cb78a4c4ea098709b98eb3
Author: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Date: Thu Dec 2 20:41:43 2010 +0000
qlcnic: validate eswitch config values for PF
Currently driver set default eswitch configuration values for PF function,
instead of validating values sent by application.
Signed-off-by: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 97319a270da37a5eab14a770f1417d8229245270
Author: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Date: Thu Dec 2 20:41:23 2010 +0000
qlcnic: Disable loopback support
Loopback mode can not be supported in CNA mode. Removing it until FW is fixed.
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7e300bc8e6736d41e7b92978f415572ac60fd59b
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:48:28 2010 +0000
sfc: Store MAC address from NVRAM in net_device::perm_addr
For some reason we failed to make this change when perm_addr was
introduced.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 02ebc26865c2755720d2ede90a5ab27c45741823
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:48:20 2010 +0000
sfc: Use current MAC address, not NVRAM MAC address, for WoL filter
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4f3907e9a600a46d8c946469ce6636080310d12e
Author: Steve Hodgson <shodgson(a)solarflare.com>
Date: Thu Dec 2 13:48:14 2010 +0000
sfc: When waking a stopped tx_queue, only lock that tx_queue
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 78d4189d6b000898db2d9a9d745468f1322cbc71
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:56 2010 +0000
sfc: Update kernel-doc to match earlier move of Toeplitz hash key
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cef68bde74f083d83c18ce870ed834e82ee0ae5a
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:51 2010 +0000
sfc: Move xmac_poll_required into struct falcon_nic_data
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 40641ed93cd53561f7d53b5fd5ed656b35f3aabd
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:45 2010 +0000
sfc: Move Falcon global event handling to falcon.c
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4833f02a2972b7da4c8a15e1e329db0f984a75d9
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:35 2010 +0000
sfc: Move mdio_lock to struct falcon_nic_data
We only have direct access to MDIO on Falcon, so move this out of
struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4de92180258ac661bbce0f0065c9c81633ac862b
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:29 2010 +0000
sfc: Move SPI state to struct falcon_nic_data
We only have direct access to SPI on Falcon, so move all this state
out of struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 90b7a4ee610bf1d14120f5e0618ae2a3568394a5
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:17 2010 +0000
sfc: Remove unnecessary inclusion of various private header files
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6a8872c54d177abd900a0cf165b76ecb4803f052
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:10 2010 +0000
sfc: Expose Falcon BootROM config through MTD, not ethtool
The ethtool EEPROM interface is really meant for exposing chip
configuration, not BootROM configuration.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6c88b0b6dc886e49c0e6ee21d677c2e380bde688
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:47:01 2010 +0000
sfc: Remove broken automatic fallback for invalid Falcon chip/board config
If the Falcon board config is invalid, we cannot proceed - we do not
have a valid board type to pass to falcon_probe_board(), and if we
kluge that to work with an unknown board then other initialisation
code will crash.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 18e3ee2cf96adf072deeb291eed670f2c23bb2fc
Author: Steve Hodgson <shodgson(a)solarflare.com>
Date: Thu Dec 2 13:46:55 2010 +0000
sfc: Fix event based MCDI completion and MC REBOOT/CMDDONE ordering issue
The mcfw *never* sends CMDDONE when rebooting. Changing this so that it always
sends CMDDONE *before* REBOOT is easy on Siena, but it's not obvious that we
could guarantee to be able to implement this on future hardware.
Given this, I'm less convinced that the protocol should be changed.
To reiterate the failure mode: The driver sees this:
issue command
receive REBOOT event
Was that reboot event sent before the command was issued, or in
response to the command? If the former then there will be a subsequent
CMDDONE event, if the latter, then there will be no CMDDONE event.
Options to resolve this are:
1. REBOOT always completes an outstanding mcdi request, and we set
the credits count to ignore a subsequent CMDDONE event with
mismatching seqno.
2. REBOOT never completes an outstanding mcdi request. If there is
no CMDDONE event then we rely on the mcdi timeout code to complete
the outstanding request, incurring a 10s delay.
I'd argue that (2) is tidier, but that incurring a 10s delay is a little
needless. Let's go with (1).
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3157183a90fdbd686f939d2f032b675f7e9983d6
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:37 2010 +0000
sfc: Clear RXIN_SEL when soft-resetting QT2025C
When we enable PMA/PMD loopback this automatically sets RXIN_SEL
(inverse polarity for RXIN). We need to clear that bit during the
soft-reset sequence, as it is not done automatically.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit adc1d234116c22247e3886fb6e9bef450a0110f2
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:31 2010 +0000
sfc: Read-to-clear LM87 alarm/interrupt status at start of day
We do not want to shut down the board based on a fault that has
already been cleared.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 71839f7d162f973f5931d30d1376a2dc5c0bed5a
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:24 2010 +0000
sfc: Distinguish critical and non-critical over-temperature conditions
Set both the 'maximum' and critical temperature limits for LM87
hardware monitors on Falcon boards. Do not shut down a port until the
critical temperature is reached, but warn as soon as the 'maximum'
temperature is reached.
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4484cd7dedecf59aee0775c6658f95bdee65f277
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:14 2010 +0000
sfc: Fix condition for no-op in set_phy_flash_cfg()
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f18ca364617d5e1fdd7300e025473496e397db4b
Author: Ben Hutchings <bhutchings(a)solarflare.com>
Date: Thu Dec 2 13:46:09 2010 +0000
sfc: Reduce log level for MCDI error response in efx_mcdi_rpc()
Some errors are expected, e.g. when sending new commands to an MC
running old firmware. Only the caller of efx_mcdi_rpc() can decide
what is a real error. Therefore log the error responses with
netif_dbg().
Signed-off-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b924dcf0038b8f83e65b44f679ad480d44f85aa6
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:03 2010 +0000
tipc: Delete tipc_ownidentity()
Moves the content of the native API routine tipc_ownidentity() into the
sole routine that calls it, since it can no longer be called in isolation.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 12bae479ee414f45ad8fe93530f5b6ea241bde3f
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:02 2010 +0000
tipc: Eliminate obsolete native API forwarding routines
Moves the content of each native API message forwarding routine
into the sole routine that calls it, since the forwarding routines
no longer be called in isolation. Also removes code in each routine
that altered the outgoing message's importance level since this is
now no longer possible.
The previous function mapping (parent function, and child API) was
as follows:
tipc_send2name
\--tipc_forward2name
tipc_send2port
\--tipc_forward2port
tipc_send_buf2port
\--tipc_forward_buf2port
After this commit, the children don't exist and their functionality
is completely in the respective parent.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 471450f7ec24ccd9ac24e6f05cd9358d40c09d03
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:01 2010 +0000
tipc: Eliminate an unused symbolic constant in link code
Removes a symbol that is not referenced anywhere by TIPC's link code.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 52fe7b725e0a1360d36c720ee87ab1e559df69db
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:01:00 2010 +0000
tipc: Eliminate useless initialization when creating subscriber
Removes initialization of a local variable that is always assigned
a different value before it is referenced.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 38f232eae20cefed2e2379d77c54babb0de6d024
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:59 2010 +0000
tipc: Remove unused domain argument from multicast send routine
Eliminates an unused argument from tipc_multicast(), now that this
routine can no longer be called by kernel-based applications.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a5c2af9922a94a875c5f4b2dcd357a1c399b7ea6
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:58 2010 +0000
tipc: Remove support for TIPC mode change callback
Eliminates support for the callback routine invoked when TIPC
changes its mode of operation from inactive to standalone or from
standalone to networked. This callback was part of TIPC's obsolete
native API and is not used by TIPC internally.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 528c771e87c3fa661bc6983b5bf0ba464d9f7c3a
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:57 2010 +0000
tipc: Delete useless function prototypes
Removes several function declarations that aren't used anywhere,
either because they reference routines that no longer exist or
because all users of the function reference it after it has already
been defined.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 28cc937eac00805e8b9c6e7ed7d590567378187f
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:56 2010 +0000
tipc: Eliminate useless return value when disabling a bearer
Modifies bearer_disable() to return void since it always indicates
success anyway.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8d71919d7afc4ade0d9de09e1d50fbf9168c368d
Author: Allan Stephens <Allan.Stephens(a)windriver.com>
Date: Tue Nov 30 12:00:55 2010 +0000
tipc: Delete unused configuration service structure definition
Removes a structure definition that is no longer used by TIPC's
configuration service.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c80262829769419e19527f972672e8df0480235a
Author: Allan Stephens <allan.stephens(a)windriver.com>
Date: Tue Nov 30 12:00:54 2010 +0000
tipc: Remove obsolete inclusions of header files
Gets rid of #include statements that are no longer required as a
result of the merging of obsolete native API header file content
into other TIPC include files.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d265fef6ddf9042195aae551e1fde211c2a1588b
Author: Allan Stephens <allan.stephens(a)windriver.com>
Date: Tue Nov 30 12:00:53 2010 +0000
tipc: Remove obsolete native API files and exports
As part of the removal of TIPC's native API support it is no longer
necessary for TIPC to export symbols for routines that can be called
by kernel-based applications, nor for it to have header files that
kernel-based applications can include to access the declarations for
those routines. This commit eliminates the exporting of symbols by
TIPC and migrates the contents of each obsolete native API include
file into its corresponding non-native API equivalent.
The code which was migrated in this commit was migrated intact, in
that there are no technical changes combined with the relocation.
Signed-off-by: Allan Stephens <Allan.Stephens(a)windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dca9b2404a6d6579828da2425c051462701efd3f
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:05:17 2010 +0000
net: kill unused macros from head file
These macros have been defined for several years since v2.6.12-rc2（tracing by git）,
but never be used. So remove them.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b672083ed36a49c323737b7c7e1d5264a7c193af
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:05:12 2010 +0000
ipv6: use ND_REACHABLE_TIME and ND_RETRANS_TIMER instead of magic number
ND_REACHABLE_TIME and ND_RETRANS_TIMER have defined
since v2.6.12-rc2, but never been used.
So use them instead of magic number.
This patch also changes original code style to read comfortably .
Thank YOSHIFUJI Hideaki for pointing it out.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 97b1ce25e8fc27f74703537ec09d4996c7a6e38a
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:04:50 2010 +0000
tcp: use TCP_BASE_MSS to set basic mss value
TCP_BASE_MSS is defined, but not used.
commit 5d424d5a introduce this macro, so use
it to initial sysctl_tcp_base_mss.
commit 5d424d5a674f782d0659a3b66d951f412901faee
Author: John Heffner <jheffner(a)psc.edu>
Date: Mon Mar 20 17:53:41 2006 -0800
[TCP]: MTU probing
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a9527a3b621e507c85b639c183c3aa22afd4eb61
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Dec 1 18:04:43 2010 +0000
net: snmp: fix the wrong ICMP_MIB_MAX value
__ICMP_MIB_MAX is equal to the total number of icmp mib,
So no need to add 1. This wastes 4/8 bytes memory.
Change it to be same as ICMP6_MIB_MAX, TCP_MIB_MAX, UDP_MIB_MAX.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2989042ca86b94bf4ffa9486921bb300ad44225f
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:19:52 2010 +0000
can: EG20T PCH: Delete unnecessary spin_lock
Delete unnecessary spin_lock for accessing Message Object.
Since all message objects are divided into tx/rx area completely,
spin_lock processing is unnecessary.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d68f6837c4972b0433e41f8bee4b2b8205610f31
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:16:15 2010 +0000
can: EG20T PCH: Enumerate LEC macros
For easy to readable, LEC #define macros are replaced to enums.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 15ffc8fddf72712cc45d51c64bd500760ec63c80
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:15:02 2010 +0000
can: EG20T PCH: Change Message Object Index
For easy to readable, add Message Object index like below.
PCH_RX_OBJ_START
PCH_RX_OBJ_END
PCH_TX_OBJ_START
PCH_TX_OBJ_END
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8339a7ed562719e040ca783bf59fa2d614d10ac9
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Mon Nov 29 18:11:52 2010 +0000
can: EG20T PCH: Separate Interface Register(IF1/IF2)
CAN register of Intel PCH EG20T has 2 sets of interface register.
To reduce whole of code size, separate interface register.
As a result, the number of function also can be reduced.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 09f921f83faa49cdea25abfb98c439c01526b89d
Merge: 4cebb34 d89197c
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Thu Dec 2 15:46:37 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
commit 4cebb34caa5122216a1e2451eae9e0fc47ec2589
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:21 2010 +0100
ath5k: Fix reset and interrupts for AHB type of devices.
On WiSoc we cannot access mac register before it is resetted.
It will crash hardware otherwise.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a0b907ee2a71052fefdf6151764095f3f97b3275
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:16 2010 +0100
ath5k: Add AHB bus support.
AHB specific functions are now in ahb.c file. AHB bus is
compiled in when CONFIG_ATHEROS_AR231X is set in kernel.
All other platforms will use PCI bus.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c31b5c9c806b1fbdc9e98885d897664a0d482989
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:11 2010 +0100
ath5k: Add initial registers values for radio RF2317 chip.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e7aecd327d80b2f156b54769013aaccb2a20645a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:06 2010 +0100
ath5k: Add a function to read chipset's MAC revision
Add bus dependent revision read function which is used to
determine chipset's MAC before hardware is initialized.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8efa5d7d6ad307ae2d220def37ca89594062c40d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:06 2010 +0100
ath5k: Check if pci pdev struct is initialized in common functions.
To be able to support other busses than PCI check if pci device
structure is initialized.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4aa5d783c9e1c72e4950ff34f388077ccecac74a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:01 2010 +0100
ath5k: Use generic eeprom read from common ath_bus_opts struct.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e5b046d86fac609f636d127a38de94a175c7e83b
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:27:01 2010 +0100
ath5k: Move PCI bus functions to separate file.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 132b1c3ee38ea6fa0501004fd0f19acb554e5a44
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:26:56 2010 +0100
ath5k: Introduce ath5k_init_softc function as in ath9k
Split pci initialization into hardware specific
functions and softc structure initialization.
Make function naming similar to ones ath9k.
Introduce ath_bus_opts in ath5k for later
AHB bus integration.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aeae4ac9090462ea38387dcdbac4f01b944af6a4
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Dec 2 10:26:51 2010 +0100
ath5k: Use Generic DMA for later support of AHB bus.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik(a)neratec.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c30ae138aa0570665725166679bdf4207041c8df
Merge: 78b8595 be21871
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Thu Dec 2 15:17:46 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
commit 78b8595691c34478a51d1c2bcbbb0f6ec8a28247
Author: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Date: Thu Dec 2 14:45:07 2010 +0200
wireless: ray_cs: use '%pm' format option to print MAC
Signed-off-by: Andy Shevchenko <andy.shevchenko(a)gmail.com>
Cc: "John W. Linville" <linville(a)tuxdriver.com>
Cc: linux-wireless(a)vger.kernel.org
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 547025d5d4d1056fb4b5a0c9c3c0d5c2fe22c082
Author: Bruno Randolf <br1(a)einfach.org>
Date: Thu Dec 2 16:23:12 2010 +0900
cfg80211: Add documentation for antenna ops
The last patch with the same title was for mac80211 ops, accidentally.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c1927d7a8fab07171d08f7a3a8b7e5fe87bb70d4
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:35 2010 +0100
mac80211: publish SMPS docs
Create a new chapter about SMPS in the
driver API part of the mac80211 book and
populate it with the existing docs.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f6b8bef3634a5c9ea326b3ab0c9615fdac5f18ab
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:34 2010 +0100
mac80211: document station handling
Add some existing documentation about station
handling to a new chapter about advanced APIs.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eebbb348df5a8c239a6300188907dec7e427bf70
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:33 2010 +0100
mac80211: publish interface iteration docs
Publish the documentation for the interface
iteration functions in the right section of
the book.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e16c01030b8794992590ff9b1b1e4b1b89e0cad3
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:32 2010 +0100
mac80211: document aggregation
Include the aggregation documentation in the
docbook, split up by public and internal docs.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cf6cb7ab59e0b37afe6e76b2e444479bf86bf933
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:31 2010 +0100
mac80211: publish some rate control docs
Add an API chapter to the rate control part of
the mac80211 book and populate it with some
existing documentation.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 625208138550562fd3bc731f53f43cb66a3be70a
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:30 2010 +0100
mac80211: publish some misc docs
There isn't a clear TX documentation yet, so
put these into the misc section for now.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7bcfda13fea4a8770deaf4b22093dc2708760128
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:29 2010 +0100
mac80211: publish docs for _ni functions
Put them along with their "regular" versions for
now, we should write more docs in the future.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d7ae30f073a179a9cebd663e7502843ddf4ba672
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:28 2010 +0100
mac80211: document workqueue
Create a new chapter for the mac80211 workqueue
that contains the documentation written for it.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2e54a7a20cf7c02ee17c56488fedb8cd3d2c2f35
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Dec 1 09:43:27 2010 +0100
cfg80211: include CQM packet loss docs
Just include them in the list of functions,
there aren't any more detailed docs (yet).
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6a0141175b6026e13652339e607a35f4b6687f27
Author: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Date: Wed Dec 1 12:30:09 2010 +0530
ath9k_htc: Remove unused structures
Signed-off-by: Sujith Manoharan <Sujith.Manoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2767363192d5937e0f61f05b1b6b881da9ee55a
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 30 13:42:08 2010 -0800
wireless: Remove unnecessary casts of usb_get_intfdata
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e7797bf2c0297098056a95b6b03ea5a9a3285e36
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Nov 30 22:33:16 2010 +0100
b43: N-PHY: fix code path on PHY init
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 76b002bd6dfdd66c58669cbdfa5cd92084b6936e
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Nov 30 22:33:15 2010 +0100
b43: N-PHY: use defines for RSSI types
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 99f6c2ef1e968c0dbdfa8c5b8f2869129b860d88
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Tue Nov 30 22:33:14 2010 +0100
b43: N-PHY: fix RSSI selection
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 44b23b488d44e56d467764ecb661830e5b02b308
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 30 12:19:11 2010 -0800
ath9k: hif_usb: Reduce indent 1 column
Invert test and return early.
Move variable declarations to local scope.
Don't initialize variables to 0 unnecessarily.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eb272441fc14ad126abfa46de8a9c58bda8added
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Nov 29 14:13:22 2010 -0800
ath9k: Move debugfs under ieee80211/[phyname]/ath9k/
This fixes debugfs problems when a phy is renamed,
and is able to remove a bit of code that is no longer
needed.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit db3949c4506a21633469d71f2915cf660eea0a35
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 11:52:07 2010 -0800
tcp: Implement ipv6 ->get_peer() and ->tw_get_peer().
Now ipv6 timewait recycling is fully implemented and
enabled.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 493f377d6dd56f4e98b198d637fe714ab124681b
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 12:14:29 2010 -0800
tcp: Add timewait recycling bits to ipv6 connect code.
This will also improve handling of ipv6 tcp socket request
backlog when syncookies are not enabled. When backlog
becomes very deep, last quarter of backlog is limited to
validated destinations. Previously only ipv4 implemented
this logic, but now ipv6 does too.
Now we are only one step away from enabling timewait
recycling for ipv6, and that step is simply filling in
the implementation of tcp_v6_get_peer() and
tcp_v6_tw_get_peer().
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:45 2010 +0100
b43: N-PHY: fix RSSI calibration
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c1d5a7a2230a162af709fa118f051e0d18ff427
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:44 2010 +0100
b43: N-PHY: initialize perical variable, add missing call to CCA reset
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 161d540c8ef31e5adbced3248873024476e2c26f
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:43 2010 +0100
b43: N-PHY: implement very basic TX power control management
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 40277cabfee7c8ef45055155895dcbef0f983c63
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 12:59:42 2010 +0100
b43: N-PHY: swap values for radio registers 0x3b and 0x3c
Specs were updated plus we become wl compatible.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aa3bf280dd3214db5b9e1f8cad7c5868ccbe71b7
Author: Hauke Mehrtens <hauke(a)hauke-m.de>
Date: Sun Nov 28 12:22:52 2010 +0100
ssb: Add sysfs attributes to ssb devices
Make it possible to read out the attributes, till now only show on
dmesg, through sysfs.
This patch was some time in OpenWrt.
Signed-off-by: Bernhard Loos <bernhardloos(a)googlemail.com>
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 172c69a47675dc1ca9c7243c031d8d77701bccc0
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Nov 28 10:39:35 2010 +0100
ssb: extract indexes for power tables
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Acked-by: Michael Buesch <mb(a)bu3sch.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae4694b2d3e4c0f47c0e804a68417be57e5daf85
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 10:59:22 2010 -0800
ipv6: Create inet6_csk_route_req().
Brother of ipv4's inet_csk_route_req().
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 15c054251ab84895ec043e90826612c1a3d6d4f1
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Dec 2 10:16:06 2010 -0800
ipv6: Add rt6_get_peer() helper.
To go along side ipv4's rt_get_peer().
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9f28ebc381ca00af0f9033a29776775068344b06
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Fri Nov 26 13:24:19 2010 -0800
iwlagn: name change for bt_ch_announce module parameter
Change the module parameter name to bt_ch_inhibition from
bt_ch_announce to better describe the functionality
In order to allow Bluetooth to activate a smart AFH mechanism
and to maximize its available bandwidth the WiFi will request
BT Core to inhibit its activity in channels that interfere
with WiFi activity (and vice versa) if bt_ch_inhibition is enabled
Set module parameter "bt_ch_inhibition=0" will disable the channel
inhibition function
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit adb90a00371a9a06a55c7b7ed7b38152f8e960c3
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Fri Nov 26 11:09:42 2010 -0800
iwlwifi: check for STATUS_EXIT_PENDING when send RXON command
If driver is on the way down, there is no need to send
RXON to uCode, check the condition before continuous the process.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 8b3ee29626031155c7844988ebe4321c151c03a2
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Thu Nov 18 11:41:48 2010 -0800
iwlagn: remove structure name reference to gen2
Give the corresponding name for .cfg data structure
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit e7cad69cdab4d6f0caadbcdd58b54214243ba98a
Author: Grumbach, Emmanuel <emmanuel.grumbach(a)intel.com>
Date: Thu Nov 18 03:47:38 2010 -0800
iwlagn: Enable PCI L1 ACTIVE state after uCode has been loaded
PCI L1 Active needs to be disabled while loading the uCode so that the bus
doesn't go to sleep. The enablement of L1 Active should be done after
the uCode has sent the ALIVE response. The enablement of L1 Active was
missing.
Enabling L1 Active allows to save power if the BIOS / bus driver allows
it.
I measured the power consumption while not associated and
idle/associated:
L1 Active disabled: 39 mA = 130mW
L1 Active enabled: 6 mA = 20 mW
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 40b97c2fe96a476f1c228345f0c6a2d135a8b226
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 14:17:53 2010 -0800
iwlagn: fix race condition when reprogram sta
During reprogram stations, do not send link quality command.
uCode will crash if receive link quality command for invalid station
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit ccb7c410ddc054b8c1ae780319bc98ae092d3854
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 1 18:09:13 2010 -0800
timewait_sock: Create and use getpeer op.
The only thing AF-specific about remembering the timestamp
for a time-wait TCP socket is getting the peer.
Abstract that behind a new timewait_sock_ops vector.
Support for real IPV6 sockets is not filled in yet, but
curiously this makes timewait recycling start to work
for v4-mapped ipv6 sockets.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4399ce402c7c837dec80bf9fb40d079b39b9265a
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 1 17:29:08 2010 -0800
inetpeer: Fix incorrect comment about inetpeer struct size.
Now with ipv6 support it is no longer less than 64 bytes.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8790ca172a1550949804a2ad59ccea310f680c9f
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Dec 1 17:28:18 2010 -0800
inetpeer: Kill use of inet_peer_address_t typedef.
They are verboten these days.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit be21871f24b0fcd8d0d09c8090385c9cec80efa3
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:26 2010 +0200
Bluetooth: clean up legal text
Remove extra spaces from legal text so that legal stuff looks
the same for all bluetooth code.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 70f23020e6d89155504b5b39f22505f4aec6fa6f
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:25 2010 +0200
Bluetooth: clean up hci code
Do not use assignment in IF condition, remove extra spaces,
fixing typos, simplify code.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 894718a6be69d8cfd191dc291b42be32a1e4851b
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:24 2010 +0200
Bluetooth: clean up l2cap code
Do not initialize static vars to zero, macros with complex values
shall be enclosed with (), remove unneeded braces.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 285b4e90318dcf421a00b2ac3fe8ab713f3281e3
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:23 2010 +0200
Bluetooth: clean up rfcomm code
Remove extra spaces, assignments in if statement, zeroing static
variables, extra braces. Fix includes.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 735cbc4784a084b7a76c43c69f9dba683bb3b48b
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Dec 1 16:58:22 2010 +0200
Bluetooth: clean up sco code
Do not use assignments in IF condition, remove extra spaces
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit b78d7b4f204a6ba1901af36c95e10fded9816054
Author: Anderson Lizardo <anderson.lizardo(a)openbossa.org>
Date: Mon Nov 29 12:15:50 2010 -0400
Bluetooth: Fix error handling for l2cap_init()
create_singlethread_workqueue() may fail with errors such as -ENOMEM. If
this happens, the return value is not set to a negative value and the
module load will succeed. It will then crash on module unload because of
a destroy_workqueue() call on a NULL pointer.
Additionally, the _busy_wq workqueue is not being destroyed if any
errors happen on l2cap_init().
Signed-off-by: Anderson Lizardo <anderson.lizardo(a)openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit eeb366564be7c311b31c70821d18a43a8a57f9bc
Author: Gustavo F. Padovan <padovan(a)profusion.mobi>
Date: Mon Nov 1 18:43:53 2010 +0000
Bluetooth: Get rid of __rfcomm_get_sock_by_channel()
rfcomm_get_sock_by_channel() was the only user of this function, so I merged
both into rfcomm_get_sock_by_channel(). The socket lock now should be hold
outside of rfcomm_get_sock_by_channel() once we hold and release it inside the
same function now.
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit e0f0cb56364958223f0cb1f1b0b0eecf1b8dcb95
Author: Gustavo F. Padovan <padovan(a)profusion.mobi>
Date: Mon Nov 1 18:43:53 2010 +0000
Bluetooth: Get rid of __l2cap_get_sock_by_psm()
l2cap_get_sock_by_psm() was the only user of this function, so I merged
both into l2cap_get_sock_by_psm(). The socket lock now should be hold
outside of l2cap_get_sock_by_psm() once we hold and release it inside the
same function now.
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit cc11b9c14da4ca1c545b424dae2ae8fb1ab04063
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Mon Nov 22 13:21:37 2010 +0200
Bluetooth: do not use assignment in if condition
Fix checkpatch errors like:
"ERROR: do not use assignment in if condition"
Simplify code and fix one long line.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Acked-by: Ville Tervo <ville.tervo(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 940a9eea80946b64b96bd8af1fc71b30c602d057
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Nov 3 12:32:45 2010 +0200
Bluetooth: timer check sk is not owned before freeing
In timer context we might delete l2cap channel used by krfcommd.
The check makes sure that sk is not owned. If sk is owned we
restart timer for HZ/5.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit a49184c229535ebedbb659214db2d4d1d77b7c07
Author: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Date: Wed Nov 3 12:32:44 2010 +0200
Bluetooth: Check sk is not owned before freeing l2cap_conn
Check that socket sk is not locked in user process before removing
l2cap connection handler.
lock_sock and release_sock do not hold a normal spinlock directly but
instead hold the owner field. This means bh_lock_sock can still execute
even if the socket is "locked". More info can be found here:
http://www.linuxfoundation.org/collaborate/workgroups/networking/socketlocks
krfcommd kernel thread may be preempted with l2cap tasklet which remove
l2cap_conn structure. If krfcommd is in process of sending of RFCOMM reply
(like "RFCOMM UA" reply to "RFCOMM DISC") then kernel crash happens.
...
[ 694.175933] Unable to handle kernel NULL pointer dereference at virtual address 00000000
[ 694.184936] pgd = c0004000
[ 694.187683] [00000000] *pgd=00000000
[ 694.191711] Internal error: Oops: 5 [#1] PREEMPT
[ 694.196350] last sysfs file: /sys/devices/platform/hci_h4p/firmware/hci_h4p/loading
[ 694.260375] CPU: 0 Not tainted (2.6.32.10 #1)
[ 694.265106] PC is at l2cap_sock_sendmsg+0x43c/0x73c [l2cap]
[ 694.270721] LR is at 0xd7017303
...
[ 694.525085] Backtrace:
[ 694.527587] [<bf266be0>] (l2cap_sock_sendmsg+0x0/0x73c [l2cap]) from [<c02f2cc8>] (sock_sendmsg+0xb8/0xd8)
[ 694.537292] [<c02f2c10>] (sock_sendmsg+0x0/0xd8) from [<c02f3044>] (kernel_sendmsg+0x48/0x80)
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko(a)nokia.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit d31dbf6e5989b2fd9a30ec5b25436e94f009d6df
Author: Vasiliy Kulikov <segooon(a)gmail.com>
Date: Sat Oct 30 18:26:31 2010 +0400
Bluetooth: hidp: fix information leak to userland
Structure hidp_conninfo is copied to userland with version, product,
vendor and name fields unitialized if both session->input and session->hid
are NULL. It leads to leaking of contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon(a)gmail.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 3185fbd9d7bb166992f072440b3329f58bf2c60a
Author: Vasiliy Kulikov <segooon(a)gmail.com>
Date: Sat Oct 30 18:26:26 2010 +0400
Bluetooth: cmtp: fix information leak to userland
Structure cmtp_conninfo is copied to userland with some padding fields
unitialized. It leads to leaking of contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon(a)gmail.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 5520d20f68310fc158dcbbecfd5eac5cdfc5a241
Author: Vasiliy Kulikov <segooon(a)gmail.com>
Date: Sat Oct 30 18:26:21 2010 +0400
Bluetooth: bnep: fix information leak to userland
Structure bnep_conninfo is copied to userland with the field "device"
that has the last elements unitialized. It leads to leaking of
contents of kernel stack memory.
Signed-off-by: Vasiliy Kulikov <segooon(a)gmail.com>
Acked-by: Marcel Holtmann <marcel(a)holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 127178d24c7eb2df53b1ba2b6f6f743e88178a1b
Author: Johan Hedberg <johan.hedberg(a)nokia.com>
Date: Thu Nov 18 22:22:29 2010 +0200
Bluetooth: Automate remote name requests
In Bluetooth there are no automatic updates of remote device names when
they get changed on the remote side. Instead, it is a good idea to do a
manual name request when a new connection gets created (for whatever
reason) since at this point it is very cheap (no costly baseband
connection creation needed just for the sake of the name request).
So far userspace has been responsible for this extra name request but
tighter control is needed in order not to flood Bluetooth controllers
with two many commands during connection creation. It has been shown
that some controllers simply fail to function correctly if they get too
many (almost) simultaneous commands during connection creation. The
simplest way to acheive better control of these commands is to move
their sending completely to the kernel side.
This patch inserts name requests into the sequence of events that the
kernel performs during connection creation. It does this after the
remote features have been successfully requested and before any pending
authentication requests are performed. The code will work sub-optimally
with userspace versions that still do the name requesting themselves (it
shouldn't break anything though) so it is recommended to combine this
with a userspace software version that doesn't have automated name
requests.
Signed-off-by: Johan Hedberg <johan.hedberg(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 392599b95d76f4f3102d8614bdc1957795cd1a3a
Author: Johan Hedberg <johan.hedberg(a)nokia.com>
Date: Thu Nov 18 22:22:28 2010 +0200
Bluetooth: Create a unified authentication request function
This patch adds a single function that's responsible for requesting
authentication for outgoing connections. This is preparation for the
next patch which will add automated name requests and thereby move the
authentication requests to a different location.
Signed-off-by: Johan Hedberg <johan.hedberg(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit ccd556fe334914bf2e465eb5bc480d49cd4406d7
Author: Johan Hedberg <johan.hedberg(a)nokia.com>
Date: Wed Nov 10 17:11:51 2010 +0200
Bluetooth: Simplify remote features callback function logic
The current remote and remote extended features event callbacks logic
can be made simpler by using a label and goto statements instead of the
current multiple levels of nested if statements.
Signed-off-by: Johan Hedberg <johan.hedberg(a)nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan(a)profusion.mobi>
commit 17f490bcedd7b6677140b2d49efe9e9e6b84de60
Merge: 61790c5 be93112
Author: Gustavo F. Padovan <padovan(a)profusion.mobi>
Date: Wed Dec 1 21:04:09 2010 -0200
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
commit 67d5288049f46f816181f63eaa8f1371877ad8ea
Author: Jon Mason <jon.mason(a)exar.com>
Date: Mon Nov 29 18:02:47 2010 +0000
vxge: update driver version
Update vxge driver version
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ead5d238146981f922e3848fac83825d87c518f0
Author: Jon Mason <jon.mason(a)exar.com>
Date: Mon Nov 29 18:02:46 2010 +0000
vxge: use strcpy for strings
Use strncpy instead of memcpy when working on strings
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1bacdbb341e8c92c58651f06727318c3d0c1c30e
Author: Jon Mason <jon.mason(a)exar.com>
Date: Mon Nov 29 18:02:45 2010 +0000
vxge: remove unnecessary printks
Remove printks for ring blocks, fifo blocks, and rx doorbell mode as
they clutter the dmesg output during modprobe and provide no useful
information.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8afe7c8acd33bc52c56546e73e46e9d546269e2c
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 29 09:47:49 2010 +0000
ipip: add module alias for tunl0 tunnel device
If ipip is built as a module the 'ip tunnel add' command would fail because
the ipip module was not being autoloaded. Adding an alias for
the tunl0 device name cause dev_load() to autoload it when needed.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4da6a738ffdb99b88efbe5b4c4fe521ca453640d
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 29 09:47:48 2010 +0000
gre: add module alias for gre0 tunnel device
If gre is built as a module the 'ip tunnel add' command would fail because
the ip_gre module was not being autoloaded. Adding an alias for
the gre0 device name cause dev_load() to autoload it when needed.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 29 09:47:47 2010 +0000
gre: minor cleanups
Use strcpy() rather the sprintf() for the case where name is getting
generated. Fix indentation.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f2cd2d3e9b3ef960612e362f0ad129d735452df2
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 29 08:14:37 2010 +0000
net sched: use xps information for qdisc NUMA affinity
Allocate qdisc memory according to NUMA properties of cpus included in
xps map.
To be effective, qdisc should be (re)setup after changes
of /sys/class/net/eth<n>/queues/tx-<n>/xps_cpus
I added a numa_node field in struct netdev_queue, containing NUMA node
if all cpus included in xps_cpus share same node, else -1.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Ben Hutchings <bhutchings(a)solarflare.com>
Cc: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0793f83f0ec2142d06abe53570417c8d95e0310a
Author: Dmitry Kravkov <dmitry(a)broadcom.com>
Date: Wed Dec 1 12:39:28 2010 -0800
bnx2x: Add Nic partitioning mode (57712 devices)
NIC partitioning is another flavor of multi function - having few
PCI functions share the same physical port. Unlike the currently
supported mode of multi-function which depends on the switch
configuration and uses outer-VLAN, the NPAR mode is switch independent
and uses the MAC addresses to distribute incoming packets to the different
functions. This patch adds the specific HW setting of the NPAR mode
and some distinctions between switch dependent (SD) and
switch independent (SI) multi-function (MF) modes where the configuration
is not the same.
Advance driver version to 1.60.00-6
Signed-off-by: Dmitry Kravkov <dmitry(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3f419d2d487821093ee46e898b5f8747f9edc9cd
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 29 13:37:14 2010 -0800
inet: Turn ->remember_stamp into ->get_peer in connection AF ops.
Then we can make a completely generic tcp_remember_stamp()
that uses ->get_peer() as a helper, minimizing the AF specific
code and minimizing the eventual code duplication when we implement
the ipv6 side of TW recycling.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b3419363808f2481b24a817f491878e1795db4c7
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:27:11 2010 -0800
ipv6: Add infrastructure to bind inet_peer objects to routes.
They are only allowed on cached ipv6 routes.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 672f007d65f50468a4a1e55825fe58e5b035324d
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:20:00 2010 -0800
inetpeer: Add inet_getpeer_v6()
Now that all of the infrastructure is in place, we can add
the ipv6 shorthand for peer creation.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 021e9299113363cc1b713f86b2cba30b8e6cb5dd
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:12:23 2010 -0800
inetpeer: Add v6 peers tree, abstract root properly.
Add the ipv6 peer tree instance, and adapt remaining
direct references to 'v4_peers' as needed.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 026630450244b8f8d1baf54548be0800aa1823ed
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 12:08:53 2010 -0800
inetpeer: Abstract address comparisons.
Now v4 and v6 addresses will both work properly.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b534ecf1cd26f094497da6ae28a6ab64cdbe1617
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 11:54:19 2010 -0800
inetpeer: Make inet_getpeer() take an inet_peer_adress_t pointer.
And make an inet_getpeer_v4() helper, update callers.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 582a72da9a41be9227dc931d728ae2906880a589
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 11:53:55 2010 -0800
inetpeer: Introduce inet_peer_address_t.
Currently only the v4 aspect is used, but this will change.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 98158f5a853cafd33b254ae0eacc0dd69f90b93b
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 30 11:41:59 2010 -0800
inetpeer: Abstract out the tree root accesses.
Instead of directly accessing "peer", change to code to
operate using a "struct inet_peer_base *" pointer.
This will facilitate the addition of a seperate tree for
ipv6 peer entries.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 61790c5f3c5f158821821a00797d94504531839f
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Tue Nov 30 15:33:40 2010 +0100
iwlagn: fix microcode error on 4965
Commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 "iwlwifi: use
antenna information in EEPROM" caused 4965 device breakage with
"Microcode SW error detected. Restarting 0x82000000." message.
This patch reverts 4965 part of that commit.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Johannes Berg <johannes(a)sipsolutions.net>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 08ca944eb240b2299e743c76b43fbc7c2dd251de
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Tue Nov 30 12:19:34 2010 +0100
mac80211: Minor optimization in ieee80211_rx_h_data
Remove a superfluous ieee80211_is_data check as that was checked a few
lines before already and we wont't get here for non-data frames at all.
Second, the frame was already converted to 802.3 header format and
reading the fc and addr1 fields was only possible because the 802.3
header is short enough and didn't overwrite the relevant parts of the
802.11 header. Make the code more obvious by checking the ethernet
header's h_dest field.
Furthermore reorder the conditions to reduce the number of checks
when dynamic powersave is not needed (AP mode for example).
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Reviewed-by: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 20ed3166c84d145589a89d8cde12aa32cf2d17f4
Author: Johannes Stezenbach <js(a)sig21.net>
Date: Tue Nov 30 16:49:23 2010 +0100
mac80211/rt2x00: add ieee80211_tx_status_ni()
All rt2x00 drivers except rt2800pci call ieee80211_tx_status() from
a workqueue, which causes "NOHZ: local_softirq_pending 08" messages.
To fix it, add ieee80211_tx_status_ni() similar to ieee80211_rx_ni()
which can be called from process context, and call it from
rt2x00lib_txdone(). For the rt2800pci special case a driver
flag is introduced.
Signed-off-by: Johannes Stezenbach <js(a)sig21.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4352fab5c2a1a602447d711c84d149bf2f0bc7ba
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:53:28 2010 +0200
ath5k: Set turbo bit on rf bank 2
* A diff between rfbuffer settings of turbo and non-turbo
modes indicates there is a bit on bank 2 related to turbo operation
(it's set on turbo modes). This bit is present on all radios except
RF5413 that seems to have a completely different bank 2. Also
since 2317 has the same rf-registers locations with 2425 and
since the bit exists on 2317 I assume it also exists on 2425/2417).
So in case we use turbo mode (40MHz) enable it on bank modification.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c2b418a07b4dc77d7efadb890ba9ad1a4161c3f
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:51:38 2010 +0200
ath5k: Clean up turbo mode initvals/rfregs
* Clean up what's left of turbo mode, since we handle all
register modifications (rfbuffer comes next) on code there
is no need to have duplicated arrays.
* Rename change_channel to skip_pcu on initvals.c as we did
on reset.c
Signed-off-by: Nick Kossifidis <micklfemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit acb091d67c5c9649cf5d25055ef6fd64239a6762
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:49:53 2010 +0200
ath5k: Cleanup turbo channel flags
* Clean up CHANNEL_T(URBO), use AR5K_BWMODE_40MHZ instead
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 73a06a683455f472cc09ad249064c66a41e29e39
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:48:32 2010 +0200
ath5k: Use correct clock when setting ofdm timings
* Use correct clock value when setting OFDM timings on
non-default bwmodes.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3bb17654605965226e5b322dbc22ece5ff354ac5
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:45:21 2010 +0200
ath5k: Skip tx power setting on AR5210 for now
* Don't return -EINVAL when trying to set tx power
on RF5110 because AR5210 reset will fail. We need to
add support for RF5110 and AR5210 eeprom in the future
but for now just skip it.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b02f5d1a17c652a74098f2a04db7fb8e6220057e
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:44:02 2010 +0200
ath5k: Tweak phy activate to rx start delay based on bwmode
* Tweak phy activation -> rx delay for different bwmodes
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c2b0ebef262e0a9b64f7ea8ec837cfc29605bef7
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:42:22 2010 +0200
ath5k: No need to save/restore staid flags on reset
* Since we set antenna flags on phy init and ack bitrate
mode on pcu init, there is no need to save/restore sta_id
flags on ath5k_hw_reset. Also we don't need to re-set our
mac address because it's not affected by resets.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8aec7af99b1e4594c4bb9e1c48005e6111f97e8e
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:39:28 2010 +0200
ath5k: Support synth-only channel change for AR2413/AR5413
* Add synth-only channel change for AR2413/5413. When we call
ath5k_reset with a channel ath5k_hw_reset will first try to
set channel on PHY while PHY is running instead of doing a normal
full reset. To do this phy_init has to change to implement this
functionality.
* Clean up change_channel flag, what it really did was skip PCU
registers when setting initvals. This is done because on reset
PCU registers are not affected (except the registers we set
in pcu init and -due to hw problems- TSF). Use a new skip_pcu
flag that's not misleading instead. In the future we might use
that to also skip PCU reset and save us the TSF etc problems
(needs testing because standard practice is to reset everything).
* Use fast channel change only when setting channel, and set skip_pcu
to false only on init. When we reset the card due to DMA or PHY
problems skip pcu but never do a fast channel change.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4c57581d939fd0f8f244b9730812069f4dac308a
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:37:30 2010 +0200
ath5k: Skip powertable setting when we are on the same channel
* Only set power table if we are changing channel/mode
there is no need to recalculate and reset the power table
all the time.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f08fbf6cf4a31c8df52b21440c7a7e6fbe474b28
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:33:22 2010 +0200
ath5k: Update PLL programming for turbo/half/quarter
* Set correct PLL settings for each bwmode
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a2677fe4298c61f0e93c063e59815bf21c530c4a
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:28:15 2010 +0200
ath5k: Update spur mitigation filter for turbo/half/quarter
* Add spur mitigation filter support for half/quarter and turbo.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2b4c69f682a2868411899a77842061dd745884f
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:26:13 2010 +0200
ath5k: Tweak power detector delays on RF5111/RF5112
* Tweak power detector delays on AR5111/AR5112 when
using half/quarter modes.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 71ba1c30851575b43ba76b0f9c26ff5567e8136c
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:24:54 2010 +0200
ath5k: Always set IFS intervals on reset
* Make sure we always set IFS timings even if no
coverage class is set. If we don't we'll miss the
needed changes for different bwmodes.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 473cae27620c27377e278a6f92aaa483060e3c19
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:21:50 2010 +0200
ath5k: Use turbo flag on DCU
* Set AR5K_DCU_GBL_IFS_MISC_TURBO_MODE flag on DCU when operating
on 40MHz
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eeb8832b3181d6ca8593051b68c466e5d2653bb3
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:19:45 2010 +0200
ath5k: Set all IFS intervals, not just slot time
* Replace set_slot_time with set_ifs_intervals that also sets
the various inter-frame space intervals based on current bwmode.
* Clean up AR5210 mess from reset_tx_queue, AR5210 only has one
data queue and we set IFS intervals for that queue on set_ifs_intervals
so there is nothing left to do for 5210 on reset_tx_queue.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 61cde037234c4b8e6497a23f5f236c64cbf9d41d
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:12:23 2010 +0200
ath5k: Extend rate_duration
* Extend ieee80211_generic_frame_duration to support the various
bwmodes.
* Better document what's going on with ack bitrates and update
write_rate_duration to support the standard ack bitrates (when
we don't set the high bit).
* Get rid of set_ack_bitrate_high and introduce a flag on ath5k_hw
for this (we only called the function on init anyway so there is no
difference).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3017fcab416d8d1ee48ca16aa9a3062f600dab8e
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:09:11 2010 +0200
ath5k: Extend get_default_sifs/slot_time
* Extend get_default_sifs/slot_time to include timings for turbo
half and quarter rate modes.
* AR5210 code for now uses timings already on core clock units
instead of usecs so rename them (we 'll clean it up later).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 25ddfa195735934256fda55bb4f2d749c19386ff
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:07:04 2010 +0200
ath5k: Move tx retries setting outside reset_tx_queue
* Move setting of tx retry limits on a separate function
(we 'll clean up this AR5210 mess later)
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b405086ba47678a5b8f6e7cd835a3d27ebb6f744
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:04:43 2010 +0200
ath5k: Increase PHY settling parameters for turo mode
* On turbo mode increase PHY settling times, note that
we only increase switch settling time on AR5212 as indicated
by initvals.
* A few cleanups: Move frame control settings for AR5210 from
reset_tx_queue to tweak_initvals and remove phy_scal settings
from tweak_initvals (we tweak them alread on set_sleep_clock).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 325089ab5847f5c1e43f42bb90d32f981867c4c1
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:02:20 2010 +0200
ath5k: Small cleanup on tweak_initvals
* Now that we properly set rx/tx latencies for AR5311 remove
that old buggy part of code left inside ath5k_hw_tweak_initval_settings
that was never executed (you can't have an RF5112 radio on a mac older
than AR5212). Also use a magic value for 5311 PHY_SCAL value.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c297560206adf0cda8ce38ef9b20b0a025754c4d
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 21:00:37 2010 +0200
ath5k: Put core clock initialization on a new function
* Handle all usec parameters in one function. It's much cleaner
this way.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fa3d2feeff4723cce8d4722902492d60b7f75fcc
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:58:34 2010 +0200
ath5k: Add new field on ath5k_hw to track bandwidth modes
* Prepare for half/quarter/turbo support, introduce a new
ah_bwmode parameter and get rid of ah_turbo. Bwmode stands
for "bandwidth mode" and can have 4 values, default (20MHz),
turbo (40MHz), half rate (10MHz), and quarter rate (5MHz).
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 14fae2d4b61b890cea58d63091406b86ec9bafcd
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:55:17 2010 +0200
ath5k: Use new function to stop beacon queue
* Since we only use ath5k_hw_stop_tx_dma to stop the beacon
queue, introduce a new function ath5k_hw_stop_beacon_queue so
that we can use that instead and have better control. In the future
we can add more beacon queue specific stuff there (maybe tweak
beacon timers or something), for now just call ath5k_hw_stop_tx_dma.
* Also since we don't call ath5k_hw_stop_rx/tx_dma from outside
dma.c, make them static.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e8325ed87457e07b9ceeb1e7a31df787dd7ee106
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:52:24 2010 +0200
ath5k: Check RXE when setting RXDP
* Make sure we are not trying to set RXDP while RX is active,
for now ignore the return value.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f7317ba2d669c1b54fb31ed7834361a700a79217
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:50:16 2010 +0200
ath5k: Use DCU early termination correctly
* DCU early termination should be used to quickly flush QCU
according to docs so don't enable it for all queues, enable
it only when stopping each queue and disable it when we are
done.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b3a28e68d5c8d788a4e538a119a5d326545add8a
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:47:31 2010 +0200
ath5k: Debug DMA timeouts
* Increase timeouts on ath5k_hw_stop_tx_dma and also wait for
tx queue to stop before checking for pending frames
* Add a new debug level to debug dma start/stop
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 80dac9eecbdb95f61b9b3c7081e02412155982b7
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:45:38 2010 +0200
ath5k: Use new dma_stop function on base.c
* Since we stop rx/tx dma and pcu durring reset there is no need to
call ath5k_hw_stop_rx/tx_dma before, also there is no need to call
them durring stop_locked since we can use ath5k_hw_dma_stop for
both.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e088f23be166635b3938571c00c686094efa7cc4
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:43:18 2010 +0200
ath5k: Stop PCU on reset
* Stop PCU receive logic (DRU) durring reset
We need to be sure pcu is not active when trying to stop rx dma
right now this is done on ath5k_reset (base.c) but later we are
going to clean it up.
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d41174fabdae348c6583cf05aeb329da232c342c
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:41:15 2010 +0200
ath5k: Add new function to stop rx/tx DMA
* Add a new function to stop rx/tx dma and use in when reset starts
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9320b5c4a7260d9593102f378201d17e3f030739
Author: Nick Kossifidis <mickflemm(a)gmail.com>
Date: Tue Nov 23 20:36:45 2010 +0200
ath5k: Reset cleanup and generic cleanup
* No functional changes
* Clean up reset:
Introduce init functions for each unit and call them instead
of having everything inside ath5k_hw_reset (it's just c/p for
now so nothing changes except calling order -I tested it with
various cards and it's ok-)
* Further cleanups:
ofdm_timings belongs to phy.c
rate_duration belongs to pcu.c
clock functions are general and belong to reset.c (more to follow)
* Reorder functions for better organization:
We start with helpers and other functions follow in categories,
init functions are last
Signed-off-by: Nick Kossifidis <mickflemm(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ea066d5a91f2610116dcd27054f749e4f07799d8
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Nov 23 20:42:27 2010 +0530
ath9k: Add support for Adaptive Power Management
This feature is to mitigate the problem of certain 3
stream chips that exceed the PCIe power requirements.An EEPROM flag
controls which chips have APM enabled which is basically read from
miscellaneous configuration element of the EEPROM header.
This workaround will reduce power consumption by using 2 Tx chains for
Single and Double stream rates (5 GHz only).All self generated frames
(regardless of rate) are sent on 2 chains when this feature is
enabled(Chip Limitation).
Cc: Paul Shaw <paul.shaw(a)atheros.com>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Tested-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dd318575ff0aae91ac4cbcc5b60c184e59267212
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Mon Nov 29 11:09:16 2010 +0100
mac80211: fix RX aggregation locking
The RX aggregation locking documentation was
wrong, which led Christian to also code the
timer timeout handling for it somewhat wrongly.
Fix the documentation, the two places that
need to hold the reorder lock across accesses
to the structure, and the debugfs code that
should just use RCU.
Also, remove acquiring the sta->lock across
reorder timeouts since it isn't necessary, and
change a few places to GFP_KERNEL because the
code path here doesn't need atomic allocations
as I noticed when reviewing all this.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Acked-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8b7f8532d15631776ce8bec2bbbc58f6aad738d1
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 28 19:37:48 2010 +0100
ath9k: fix software retry counter tracking
The recent tx path cleanups moved the software retry count tracking
from the ath_buf to the skb cb, however the actual counter update
referred to the wrong location, confusing block-ack window tracking.
Fix this by using the retries counter in the struct ath_frame_info.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 81fc2a332045dc1dae24f24d3e2dc4656f2cc498
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 26 23:24:33 2010 +0530
Revert "ath9k_htc: Handle monitor mode properly for HTC devices"
This reverts commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb.
The change had broken the packet injection on monitoring mode.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c5e9c830a04ece8f0c35db2c1e0f6d87bd64894
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Fri Nov 26 06:10:07 2010 -0800
ath9k: Remove code which enables btcoex based on subsys id
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8f5dcb1cfb71ce832f53a4723deba72e6695078b
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Fri Nov 26 06:10:06 2010 -0800
ath9k: Reintroduce modparam to enable btcoex
It is not ideal to enable btcoex based on subsys id as it is
not unique, they are so random. It is also a pain keeping
all of them in a table to enable btcoex for a particular
hw. Going back to the old idea.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f30221e4ec62d905b56d5e8f7ccab6b406a97cf5
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Thu Nov 25 10:02:30 2010 +0100
mac80211: implement off-channel mgmt TX
This implements the new off-channel TX API
in mac80211 with a new work item type. The
operation doesn't add a new work item when
we're on the right channel and there's no
wait time so that for example p2p probe
responses will be transmitted without delay.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f7ca38dfe58c20cb1aa2ed9643187e8b194b5bae
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Thu Nov 25 10:02:29 2010 +0100
nl80211/cfg80211: extend mgmt-tx API for off-channel
With p2p, it is sometimes necessary to transmit
a frame (typically an action frame) on another
channel than the current channel. Enable this
through the CMD_FRAME API, and allow it to wait
for a response. A new command allows that wait
to be aborted.
However, allow userspace to specify whether or
not it wants to allow off-channel TX, it may
actually want to use the same channel only.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c20ec76157747434652e721cdd4dccd8654ad370
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:42:02 2010 +0000
forcedeth: Use netdev_dbg for printk(KERN_DEBUG
Use the normal debugging functions.
Print mac address when using random_ether_addr.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ef46ffbc2841dddebe521764c06673474ca5d041
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:42:01 2010 +0000
forcedeth: Remove netdev_dbg uses
These were probably just for initial driver debugging
and have not been enabled in builds in git history.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b2ba08e606dfd106a394c3ac7a56c497b4c8f230
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:42:00 2010 +0000
forcedeth: Convert dev_printk(<level> to dev_<level>(
Use vsprintf extension %pM for a mac address in one instance.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cd66328bdab782ee40d17b573a3067a591cb7b4f
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:59 2010 +0000
forcedeth: Separate vendor specific initializations into functions
Neaten the phy_init function by adding and calling vendor
specific functions.
object size is reduced by ~1kb:
$ size drivers/net/forcedeth.o.*
text data bss dec hex filename
83475 1848 19304 104627 198b3 drivers/net/forcedeth.o.new
84459 1848 19544 105851 19d7b drivers/net/forcedeth.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c41d41e1687dcf344f55dd15c7121532e5c195d4
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:58 2010 +0000
forcedeth: Add function init_realtek_8211b
Deduplicate the code use for the init/reset of this device.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d397f3698ec438c3c14abf45bfac88cca1882d9
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:57 2010 +0000
forcedeth: Convert pr_<level> to netdev_<level>
Use netdev_<level> when a struct net_device * is available.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 294a554e274f961ac33c7d739d5b912bd0005f5b
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:56 2010 +0000
forcedeth: Use pr_fmt and pr_<level>
Convert printks to pr_<level>.
Remove "forcedeth: " from some calls as it's now added by pr_fmt.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f52dafc1a67c98baa9b6fa1866a4caa4be4831fb
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:55 2010 +0000
forcedeth: Convert remaining dprintk to netdev_dbg
The remaining dprintk uses are emitted as KERN_INFO.
Change these dprintk uses to netdev_dbg.
Remove the now unused dprintk macros.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:54 2010 +0000
forcedeth: Use print_hex_dump
Use the standard code to emit hex dumps.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6b80858d2c0a378894b9df35d3703d62b0b12dbc
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:53 2010 +0000
forcedeth: convert dprintk(KERN_DEBUG to netdev_dbg
Use the more standard macro to preface netdev->name.
Fix casting on resource use.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 344d0dce5164d0bf2d73cf10510fe08ed8cf8248
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 29 07:41:52 2010 +0000
forcedeth: Change reg_delay arguments and use
Move the printk out of reg_delay and make
the callers emit a message on error.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 77148625e10d0fda50d05e92d199c0df17b66e9a
Merge: a417786 51cce8a
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 29 11:19:09 2010 -0800
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit a41778694806ac1ccd4b1dafed1abef8d5ba98ac
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Nov 28 21:43:02 2010 +0000
xps: add __rcu annotations
Avoid sparse warnings : add __rcu annotations and use
rcu_dereference_protected() where necessary.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b02038a17b271e0f70616c54e4eccb5cc33d1b74
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Nov 28 05:43:24 2010 +0000
xps: NUMA allocations for per cpu data
store_xps_map() allocates maps that are used by single cpu, it makes
sense to use NUMA allocations.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 49b4a6546fac02f58784f0744e0f99a6562ccc03
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Mon Nov 29 00:14:58 2010 +0000
sctp: kill unused macros in head file
1. SCTP_CMD_NUM_VERBS,SCTP_CMD_MAX
These two macros have never been used for several years since v2.6.12-rc2.
2.sctp_port_rover,sctp_port_alloc_lock
The commit 063930 abandoned global variables of port_rover and port_alloc_lock,
but still keep two macros to refer to them.
So, remove them now.
commit 06393009000779b00a558fd2f280882cc7dc2008
Author: Stephen Hemminger <shemminger(a)linux-foundation.org>
Date: Wed Oct 10 17:30:18 2007 -0700
[SCTP]: port randomization
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd
Author: Scott J. Goldman <scottjg(a)vmware.com>
Date: Sat Nov 27 10:33:55 2010 +0000
vmxnet3: fix compilation when RSS is disabled
If RSS is disabled, we can ifdef out some RSS specific code. This fixes
the compile error found by Randy Dunlap.
Signed-off-by: Scott J. Goldman <scottjg(a)vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh(a)vmware.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bf26414510103448ad3dc069c7422462f03ea3d7
Author: Tom Herbert <therbert(a)google.com>
Date: Fri Nov 26 08:36:09 2010 +0000
xps: Add CONFIG_XPS
This patch adds XPS_CONFIG option to enable and disable XPS. This is
done in the same manner as RPS_CONFIG. This is also fixes build
failure in XPS code when SMP is not enabled.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8fa9208e305e24978b897d6ea057604444ce77e1
Author: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Date: Fri Nov 26 02:41:20 2010 +0000
qeth: l3 fix len in tso hdr
The tso hdr is longer then the regular l3 hdr. Fix the calculation
of the total len by accounting the size of the tso hdr.
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2b6203bb7d85e6a2ca2088b8684f30be70246ddf
Author: Ursula Braun <ursula.braun(a)de.ibm.com>
Date: Fri Nov 26 02:41:19 2010 +0000
qeth: enable interface setup if LAN is offline
Device initialization of a qeth device contains a STARTLAN step.
This step may fail, if cable is not yet plugged in. The qeth device
stays in state HARDSETUP until cable is plugged in. This prevents
further preparational initialization steps of the qeth device and
its network interface. This patch makes sure initialization of qeth
device continues, even though cable is not yet plugged in.
Once carrier is available, qeth is notified, triggers a recovery
which results in a working network interface.
Signed-off-by: Ursula Braun <ursula.braun(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cdac082e051136a021f28d0f63c56e916b541253
Author: Joe Perches <joe(a)perches.com>
Date: Fri Nov 26 02:41:18 2010 +0000
drivers/s390/net: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f3aa3136d9c15ff693198eb34701a74bb0b6b969
Author: Sachin Sant <sachinp(a)in.ibm.com>
Date: Fri Nov 26 02:41:17 2010 +0000
qeth lcs: convert mc rwlock to RCU
Commit 1d7138de878d1d4210727c1200193e69596f93b3
igmp: RCU conversion of in_dev->mc_list
converted rwlock to RCU.
Update the s390 network drivers(qeth & lcs) code to adapt to this change.
V2 : Changes based on suggestions given by Eric Dumazet
Signed-off-by: Sachin Sant <sachinp(a)in.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun(a)de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka(a)de.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5
Author: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Date: Sun Nov 28 18:10:53 2010 -0800
stmmac: fix stmmac_resume removing not yet used shutdown flag
The commit to convert to use the dev_pm_ops struct
introduces a bug. The shutdown flag is not yet used
because the hibernation on memory is done by using
the freeze callback.
Thanks to Vlad for having reported it.
Reported-by: Vlad Lungu <vlad.lungu(a)windriver.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit de855b992d75e49816eb09231764e7a63a4f555d
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:48 2010 +0000
forcedeth: use usleep_range not msleep for small sleeps
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 34cf97eb255b09751f1eb1b5573813e9ea3fe21f
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:46 2010 +0000
forcedeth: do not use assignment in if conditions
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5504e1397cc860e61fbb68c56e7a10db613275fd
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:45 2010 +0000
forcedeth: include <linux/io.h> and <linux/uaccess.h> instead of <asm/io.h> and <asm/uaccess.h> as suggested by checkpatch
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9b03b06b65856f70564c53654d44053f3072379e
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:44 2010 +0000
forcedeth: remove unnecessary checks before kfree
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 78aea4fc67a7534d5f5bbb0419a2bcb50b0547c9
Author: Szymon Janc <szymon(a)janc.net.pl>
Date: Sat Nov 27 08:39:43 2010 +0000
forcedeth: fix multiple code style issues
Signed-off-by: Szymon Janc <szymon(a)janc.net.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 47c05314328d9c40f6006783dc4c1e3080bd2914
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 28 00:02:59 2010 +0000
zd1211rw: document need for kmalloc cast
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e80be0b0ee307a2801e57cf36333d3d659e4bcc6
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 27 23:05:45 2010 +0000
vxge: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f3167460144cd2c24b964a32d40d32f851b5d5f4
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 27 23:05:44 2010 +0000
qlcnic: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0acdf68f495793143802dd4f3e47918dddcceed7
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 27 23:05:43 2010 +0000
netxen: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c661c4a2b0d64c33afc9018a406162b1f8ac5617
Author: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Date: Thu Nov 25 07:53:55 2010 +0000
cxgb3: Removing unused return variable
Currently the ret variable is not used for anything other than
receive the value of the t3_adapter_error(), which will always be 0,
because the reset parameter is 0.
Signed-off-by: Breno Leitao <leitao(a)linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 82a39eb6b3829a02e235656feddb4542517fcabc
Author: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Date: Thu Nov 25 03:15:07 2010 +0000
ipv6: Prepare the tree for un-inlined jhash.
jhash is widely used in the kernel and because the functions
are inlined, the cost in size is significant. Also, the new jhash
functions are slightly larger than the previous ones so better un-inline.
As a preparation step, the calls to the internal macros are replaced
with the plain jhash function calls.
Signed-off-by: Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit aa285b1740f5b13e5a2606a927f3129954583d78
Author: Timo Teräs <timo.teras(a)iki.fi>
Date: Tue Nov 23 04:03:45 2010 +0000
xfrm: fix gre key endianess
fl->fl_gre_key is network byte order contrary to fl->fl_icmp_*.
Make xfrm_flowi_{s|d}port return network byte order values for gre
key too.
Signed-off-by: Timo Teräs <timo.teras(a)iki.fi>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6a632625c7da7594d059b88dae0e9c591af147ba
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:32 2010 +0000
ethoc: remove division from loops
Calculating the BD entry using a modulus operation isn't optimal, especially
inside the loop. This patch removes the modulus operations in favour of:
i) simply checking for wrapping in the case of cur_rx
ii) forcing num_tx to be a power of two and using it to mask out the
entry from cur_tx
The also prevents possible issues related overflow of the cur_rx and cur_tx
counters.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:31 2010 +0000
ethoc: fix function return type
update_ethoc_tx_stats doesn't need to return anything so make its return
type void in order to avoid an unnecessary cast when the function is called.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8dac428ae9ae54d8e8540ac157d92925dd7ebed8
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:30 2010 +0000
ethoc: rework mdio read/write
MDIO read and write were checking whether a timeout had expired to determine
whether to recheck the result of the MDIO operation. Under heavy CPU usage,
however, it was possible for the timeout to expire before the routine got
around to be able to check a second time even, thus erroneousy returning an
-EBUSY.
This patch changes the the MDIO IO routines to try up to five times to complete
the operation before giving up, thus lessening the dependency on CPU load.
This resolves a problem whereby a ping flood would keep the CPU so busy that
the above problem would manifest itself; the MDIO command to check link status
would fail and the interface would erroneously be shut down.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fa98eb0e867c6c16e239545d4deb7ad8f40631b3
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:29 2010 +0000
ethoc: rework interrupt handling
The old interrupt handling was incorrect in that it did not account for the
fact that the interrupt source bits get set irregardless of whether or not
their corresponding mask is set. This patch fixes that by masking off the
source bits for masked interrupts.
Furthermore, the handling of transmission events is moved to the NAPI polling
handler alongside the reception handler, thus preventing a whole bunch of
interrupts during heavy traffic.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 20f70ddd6558a39a89dba4af675686c5a8dbd7b3
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:28 2010 +0000
ethoc: Double check pending RX packet
An interrupt may occur between checking bd.stat and clearing the
interrupt source register which would result in the packet going totally
unnoticed as the interrupt will be missed. Double check bd.stat after
clearing the interrupt source register to guard against such an
occurrence.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7438a5455734d109fdf18d97147dc57a6dbe5a44
Author: Adam Edvardsson <adam.edvardsson(a)orsoc.se>
Date: Thu Nov 25 02:30:27 2010 +0000
ethoc: enable interrupts after napi_complete
Occasionally, it seems that some race is causing the interrupts to not be
reenabled otherwise with the end result that networking just stops working.
Enabling interrupts after calling napi_complete is more in line with what
other drivers do.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit eac0d3ff5a92de410964fdf0d072314821ca39fc
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:26 2010 +0000
ethoc: remove unused spinlock
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e0f4258be2515afce8ef1e6fb22312525c281798
Author: Jonas Bonn <jonas(a)southpole.se>
Date: Thu Nov 25 02:30:25 2010 +0000
ethoc: Add device tree configuration
This patch adds the ability to describe ethernet devices via a flattened
device tree. As device tree remains an optional feature, these bits all
need to be guarded by CONFIG_OF ifdefs.
MAC address is settable via the device tree parameter "local-mac-address";
however, the selection of the phy id is limited to probing, for now.
Signed-off-by: Jonas Bonn <jonas(a)southpole.se>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3f0a069a1d5c0ccace735e3a62c1bcef53e4c354
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:45 2010 +0000
X25 remove bkl in call user data length ioctl
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 74a7e440807d34e586e9feb8e14851b5c80fbfe5
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:43 2010 +0000
X25 remove bkl from causediag ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5b7958dfa5db758e36e92e1790075b470b4947f8
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:40 2010 +0000
X25 remove bkl from calluserdata ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f90de660678cf553f63c387945830a2e4d26dd3e
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:35 2010 +0000
X25 remove bkl in facility ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5595a1a5997953dbd8c5df7c2f7d4b3a2eb2be4b
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 25 02:18:15 2010 +0000
X25 remove bkl in subscription ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5892b9e9ebdde50fbd524570d61ceb74f8be33f3
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Sun Nov 28 00:23:35 2010 +0000
bnx2x: Use helpers instead of direct access to the shinfo(skb) fields
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit be7ff1afec25f2700ca85e3956a2cb3a7b74acd5
Author: Michael Chan <mchan(a)broadcom.com>
Date: Wed Nov 24 13:48:55 2010 +0000
bnx2: Remove config access to non-standard registers
In KVM passthrough mode, the driver may not have config access to
non-standard registers. The BNX2_PCICFG_MISC_CONFIG config register
access to setup mailbox swapping can be done using MMIO.
Update version to 2.0.20.
Signed-off-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a5dac108d57072eec4d6745f32c162524509f2cb
Author: Eddie Wai <waie(a)broadcom.com>
Date: Wed Nov 24 13:48:54 2010 +0000
bnx2: Fix reset bug on 5709
The 5709 chip requires the BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE bit to be
cleared and polling for pending DMAs to complete before chip reset.
Without this step, we've seen NMIs during repeated resets of the chip.
Signed-off-by: Eddie Wai <waie(a)broadcom.com>
Signed-off-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 19eb5cc559f716dc98ce03a5bad6030fdc71e897
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Wed Nov 24 13:14:50 2010 +0000
8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues
Now that the vlan device is lockless and single queue do not
transfer the real num queues. This is causing a BUG_ON to occur.
kernel BUG at net/8021q/vlan.c:345!
Call Trace:
[<ffffffff813fd6e8>] ? fib_rules_event+0x28/0x1b0
[<ffffffff814ad2b5>] notifier_call_chain+0x55/0x80
[<ffffffff81089156>] raw_notifier_call_chain+0x16/0x20
[<ffffffff813e5af7>] call_netdevice_notifiers+0x37/0x70
[<ffffffff813e6756>] netdev_features_change+0x16/0x20
[<ffffffffa02995be>] ixgbe_fcoe_enable+0xae/0x100 [ixgbe]
[<ffffffffa01da06a>] vlan_dev_fcoe_enable+0x2a/0x30 [8021q]
[<ffffffffa02d08c3>] fcoe_create+0x163/0x630 [fcoe]
[<ffffffff811244d5>] ? mmap_region+0x255/0x5a0
[<ffffffff81080ef0>] param_attr_store+0x50/0x80
[<ffffffff810809b6>] module_attr_store+0x26/0x30
[<ffffffff811b9db2>] sysfs_write_file+0xf2/0x180
[<ffffffff8114fc88>] vfs_write+0xc8/0x190
[<ffffffff81150621>] sys_write+0x51/0x90
[<ffffffff8100c0b2>] system_call_fastpath+0x16/0x1b
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5a0d2268d259886f0c87131639d19eb4a67b4532
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 23 10:42:02 2010 +0000
net: add netif_tx_queue_frozen_or_stopped
When testing struct netdev_queue state against FROZEN bit, we also test
XOFF bit. We can test both bits at once and save some cycles.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d3c15cab213becc49a6f2ad7f48a59513a5f17dd
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Wed Nov 24 21:47:56 2010 +0000
ipv6: kill two unused macro definition
1. IPV6_TLV_TEL_DST_SIZE
This has not been using for several years since created.
2. RT6_INFO_LEN
commit 33120b30 kill all RT6_INFO_LEN's references, but only this definition remained.
commit 33120b30cc3b8665204d4fcde7288638b0dd04d5
Author: Alexey Dobriyan <adobriyan(a)sw.ru>
Date: Tue Nov 6 05:27:11 2007 -0800
[IPV6]: Convert /proc/net/ipv6_route to seq_file interface
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a40c9f88b5e3da500ddab9440e5ddac170c12281
Author: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
Date: Tue Nov 23 22:57:47 2010 +0000
net: add some KERN_CONT markers to continuation lines
Cc: netdev(a)vger.kernel.org
Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5a6f95e653adf52ee1ff09cd5e66c2640c65ff66
Author: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Date: Tue Nov 23 03:08:27 2010 +0000
netxen: avoid using reset_devices as it may become obsolete
In kdump environment do not depend on reset_devices
parameter to reset the device as the parameter may become obsolete.
Instead use an adapter specific mechanism to determine if the device
needs a reset.
Driver maintains a count of number of pci functions probed
and decrements the count when remove handler of that pci function
is called. If the first probe, probe of function 0,
detects the count as non zero then reset the device.
Signed-off-by: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b0044bcfa95ddf2e317863fb29121c284b6725ca
Author: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Date: Tue Nov 23 01:25:21 2010 +0000
qlcnic: avoid using reset_devices as it may become obsolete.
In kdump environment do not depend upon reset_devices parameter
to reset the pci function as this parameter may become obsolete.
Instead use an adapter specific mechanism to determine if the pci
function needs to be reset.
Per function refcount is maintained in driver, which is set in probe
and reset in remove handler of adapter. If the probe detects the count
as non zero then reset the function.
Signed-off-by: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5584b8078a60e34ec7d37c9b67a0f3d389a1a2f6
Author: Shan Wei <shanwei(a)cn.fujitsu.com>
Date: Mon Nov 22 23:00:42 2010 +0000
sctp: kill unused macro definition
These macros have been existed for several years since v2.6.12-rc2.
But they never be used. So remove them now.
Signed-off-by: Shan Wei <shanwei(a)cn.fujitsu.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cf7afbfeb8ceb0187348d0a1a0db61305e25f05f
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Mon Nov 22 01:31:54 2010 +0000
rtnl: make link af-specific updates atomic
As David pointed out correctly, updates to af-specific attributes
are currently not atomic. If multiple changes are requested and
one of them fails, previous updates may have been applied already
leaving the link behind in a undefined state.
This patch splits the function parse_link_af() into two functions
validate_link_af() and set_link_at(). validate_link_af() is placed
to validate_linkmsg() check for errors as early as possible before
any changes to the link have been made. set_link_af() is called to
commit the changes later.
This method is not fail proof, while it is currently sufficient
to make set_link_af() inerrable and thus 100% atomic, the
validation function method will not be able to detect all error
scenarios in the future, there will likely always be errors
depending on states which are f.e. not protected by rtnl_mutex
and thus may change between validation and setting.
Also, instead of silently ignoring unknown address families and
config blocks for address families which did not register a set
function the errors EAFNOSUPPORT respectively EOPNOSUPPORT are
returned to avoid comitting 4 out of 5 update requests without
notifying the user.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 89bf67f1f080c947c92f8773482d9e57767ca292
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 22 00:15:06 2010 +0000
drivers/net: use vzalloc()
Use vzalloc() and vzalloc_node() in net drivers
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fe6d2a38b2076cba515dc95b5dc1589a7ab51c17
Author: Sathya Perla <sathya.perla(a)emulex.com>
Date: Sun Nov 21 23:25:50 2010 +0000
be2net: adding support for Lancer family of CNAs
Key changes are:
- EQ ids are not assigned consecutively in Lancer. So, fix mapping of MSIx
vector to EQ-id.
- BAR mapping and some req locations different for Lancer.
- TCP,UDP,IP checksum fields must be compulsorily set in TX wrb for TSO in
Lancer.
- CEV_IST reg not present in Lancer; so, peek into event queue to check for
new entries
- cq_create and mcc_create cmd interface is different for Lancer; handle
accordingly
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar(a)emulex.com>
Signed-off-by: Sathya Perla <sathya.perla(a)emulex.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9a67d761b39614c0495dcab9a204e21a9f4c4d31
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Thu Nov 18 10:40:03 2010 -0800
iwlagn: minor change in bt coex normal LUT
Minor changes in LUT
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 506aa156fa736e9f9ce476239c9549ebbf6b08ea
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 24 17:25:03 2010 -0800
iwlagn: use different kill mask when SCO active
use different kill_ack_mask and kill_cts_mask when detect SCO
is active.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 638514ff5d5845c6eba8c266ea04325be6e7d106
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:55 2010 -0800
iwlagn: Offical name for 100/130 device
Change to offical name for 100 devices:
"Intel(R) Centrino(R) Wireless-N 100"
Change to offical name for 130 devices:
"Intel(R) Centrino(R) Wireless-N 130"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit d2eceef02e717751d4f6a01eddea6f241d63c213
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:54 2010 -0800
iwlagn: Offical name for 6000g2b device
Change to offical name for 6000g2b devices:
"Intel(R) Centrino(R) Wireless-N 1030"
"Intel(R) Centrino(R) Advanced-N 6230"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 55017ab87831b3ca449b81b83b180baac2895666
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:53 2010 -0800
iwlagn: Offical name for 6000g2a device
Change to offical name for 6000g2a devices:
"Intel(R) Centrino(R) Advanced-N 6205"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit f9dc6467223319acaea64d95ff208409e4e48d07
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 17 12:13:52 2010 -0800
iwlagn: Offical name for 6050g2 device
Change to offical name for 6050g2 devices:
"Intel(R) Centrino(R) Wireless-N 6150"
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 0c4ac342997c9597706a8fcbb0ccf920b3d33570
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 17 11:33:27 2010 -0800
iwlwifi: use mac80211 AC defines
Instead of hardcoding the numbers that must
match mac80211, use the constants. Not that
this means we could change the constants,
but at least this way it's clearer.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 6fb5511ab96d9f31be747bab842f96227a5c7aec
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:55:02 2010 -0800
iwlagn: advertise reliable TX status
Our hardware has reliable TX status, but we're
not currently advertising that to mac80211.
Since the packet loss monitoring will depend
on it, advertise it.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 2e34034e8c9755ff144379d410d5227926e91cce
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:51:38 2010 -0800
iwlagn: fix station powersave accounting for aggregation
Since aggregation queues are station-specific, the
device will not reject packets in them but rather
will stop the appropriate aggregation queues when
a station goes to sleep. I forgot to account for
this in the driver, so if a station went to sleep
that had aggregation enabled, traffic would stop
indefinitely.
Fix this by only accounting frames queued on the
normal AC queues for associated station.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 67158b67cea0c92dba1dda74cde926d149cc1a2e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:51:04 2010 -0800
iwlagn: remove powersave warning
Through races, a packet may be enqueued for
transmission to a station while that station
is going to sleep, in which case the warning
here triggers. Instead of warning, check the
condition -- if this packet is not a PS-poll
response then we still enqueue it but it will
be rejected by the device since the station
is marked as asleep.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 15 13:43:07 2010 -0800
iwlwifi: use antenna information in EEPROM
The valid tx/rx antenna information is part of EEPROM, so use it
to configure the device.
For few cases, the EEPROM did not reflect the correct antenna, but
it is too late to modify the EEPROM, so overwrite with .cfg parameters
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 4b7384f936817489a4172b9c5d946f63f479ca15
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 15 13:56:10 2010 -0800
iwlwifi: remove unused define
was not used, remove it
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 51cce8a590c4696d62bfacc63378d1036084cef7
Merge: 2fe66ec 4f85593
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Nov 24 16:49:20 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
commit 4f8559383c41262b50dc758e2e310f257ce6a14d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Nov 20 03:08:48 2010 +0100
ath9k_hw: remove ath9k_hw_stoppcurecv
It is no longer used anywhere
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fa6e15e0b5952fd2cd99fc6d4f4473f6b9da18df
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:22 2010 +0530
ath9k_htc: Identify devices using driver_info
Categorize AR7010 & AR9287 devices based on driver_info
of usb_device_id, instead of PIDs. This avoids per-device cases
and minimize code changes for new device addition.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f7ec8fb4d6f8f3ecb8b11e9e46ece95aa66139cc
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:21 2010 +0530
ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB)
AR9287 devices (PCI/USB) use different eeprom start location
to read nvram. New devices might endup with same devid. So use
driver_info to set offset, instead of devid. driver_info is
valid for HTC devices alone which is filled in usb_device_id.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 64f121708342afec306ce52920cc9982f4f1008f
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:20 2010 +0530
ath9k_htc: Add driver_info in usb device list
Added driver_info to identify AR7010, R9287 HTC devices.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bedbbb959d2c1d1dbb4c2215f5b7074b1da3030a
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Fri Nov 19 16:53:19 2010 +0530
ath: Add a driver_info bitmask field
The driver_info stores the device category information which
is used to load appropriate device firmware, select firmware offset
and eeprom starting location. The driver_info is accessed across
ath9k_htc and ath9k_hw. Hence placed under common structure.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 35162ba75900209755628ccf7357763797037ba6
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:56 2010 -0800
iwlwifi: advance power management support
For 6000g2b and up, adding advance power management support
for better power consumption
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1f37daf3233ccda5072f715d6c322d84833cdd92
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:55 2010 -0800
iwlwifi: power management checking for shadow register
If shadow register is enable, modify the power management
command to inform uCode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:54 2010 -0800
iwlwifi: consider BT for power management
Check the BT PSPoll flag when fill PM command to uCode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 97badb0eefc9b6f23f864c5348b695be35f05882
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:53 2010 -0800
iwlwifi: add more power management flags
Adding additional power management option available for the device.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eeb1f83fa8f96501331cc17b73c57999e3a1ec5d
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 23 10:58:52 2010 -0800
iwlagn: name change for BT config flag
Bit 7 of BT config flag is used to enable/disable PSPoll sync.
Make the name to match it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 99ba2a14283be96a682e04455061c08a46bbf4ec
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 24 08:10:06 2010 +0100
mac80211: implement packet loss notification
For drivers that have accurate TX status reporting
we can report the number of consecutive lost packets
to userspace using the new cfg80211 CQM event. The
threshold is fixed right now, this may need to be
improved in the future.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c063dbf52b998b852122dff07a8b8dd430b38437
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 24 08:10:05 2010 +0100
cfg80211: allow using CQM event to notify packet loss
This adds the ability for drivers to use CQM events
to notify about packet loss for specific stations
(which could be the AP for the managed mode case).
Since the threshold might be determined by the
driver (it isn't passed in right now) it will be
passed out of the driver to userspace in the event.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 79b1c460a0b55e55981c25c56597c4d5d2872de3
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 24 14:34:41 2010 +0900
cfg80211: Add documentation for antenna ops
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 48124d1a91fb77defc9734b4556350d59671fb2c
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Nov 23 15:05:02 2010 -0800
mac80211: avoid aggregation for VO traffic
This should help with latency issues which can happen when
using aggregation.
Cc: Felix Fietkau <nbd(a)openwrt.org>
Cc: Matt Smith <matt.smith(a)atheros.com>
Cc: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c8b576061d87e2a4fb100e70c6a6dae189b3a310
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Nov 23 15:05:01 2010 -0800
ath9k: avoid aggregation for VO traffic
This should help with latency issues which can happen when
using aggregation.
Cc: Matt Smith <matt.smith(a)atheros.com>
Cc: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 72a8a3edd630995662bdc85957206685f376f9c4
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 23 03:10:32 2010 +0100
mac80211: reduce the number of retries for nullfunc probing
Since nullfunc frames are transmitted as unicast frames, they're more
reliable than the broadcast probe requests, so we need fewer retries
to figure out whether the AP is really gone.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4e5ff37692df35c8826f1291204841b174d3c3ce
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 23 03:10:31 2010 +0100
mac80211: use nullfunc instead of probe request for connection monitoring
nullfunc frames are better for connection monitoring, because probe requests
are answered even if the AP has already dropped the connection, whereas
nullfunc frames from an unassociated station will trigger a disassoc/deauth
frame from the AP (WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA), which allows
the station to reconnect immediately instead of waiting until it attempts to
transmit the next unicast frame.
This only works on hardware with reliable tx ACK reporting, any other hardware
needs to fall back to the probe request method.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dd5b4cc71cd09c33e1579cc6d5720656e94e52de
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 22 20:58:24 2010 +0100
cfg80211/mac80211: improve ad-hoc multicast rate handling
- store the multicast rate as an index instead of the rate value
(reduces cpu overhead in a hotpath)
- validate the rate values (must match a bitrate in at least one sband)
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 46090979a55a0dc2cdb3d939f94fa47742108194
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 23 20:28:03 2010 +0100
mac80211: probe the AP when resuming
Check the connection by probing the AP (either using nullfunc or a
probe request). If nullfunc probing is supported and the assoc is no
longer valid, the AP will send a disassoc/deauth immediately.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7ccc8bd7593634d827e8bc55898a5038e29848b5
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Nov 19 22:55:38 2010 +0100
mac80211: calculate beacon loss time accurately
Instead of using a fixed 2 second timeout, calculate beacon loss interval
from the advertised beacon interval and a frame count. With this beacon
loss happens after N (default 7) consecutive frames are missed which
for a typical setup (100TU beacon interval) is ~700ms (or ~1/3 previous).
Signed-off-by: Sam Leffler <sleffler(a)chromium.org>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c8a7972c3b3633bf90daf50b135665d8ca4838c4
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Nov 19 22:55:37 2010 +0100
mac80211: restart beacon miss timer on system resume from suspend
Signed-off-by: Paul Stewart <pstew(a)google.com>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0b81c23d2e3a8589514fa69b2f153f006a4ad773
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 21:11:43 2010 +0100
b43: N-PHY: little cleanups
Remove some typos, warnings, initialize some values to follow wl's code path.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a529cecd29ecf1e5416316ae06ce515bf67b5d5a
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 21:11:42 2010 +0100
b43: N-PHY: rev2: save and restore PHY regs on RSSI poll
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fee613b77df721781b9794945f0f1a8f535456ff
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 21:11:41 2010 +0100
b43: N-PHY: fix BPHY init
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bec186452b4cfecff9e2c579bfd4016119d39614
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:28:00 2010 +0100
b43: N-PHY: init BPHY when needed
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a5d3598de086cd38f71fe2fec43ac3ca97bb24bb
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:27:59 2010 +0100
b43: N-PHY: fix some typos, conditions, set gain_boost
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c0f05b9879a324937f14270e4a14d661d2beca63
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:27:58 2010 +0100
b43: N-PHY: minor fixes to match specs
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 69a3229edcf0c354e1cd93a811843fba7b6e1472
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Nov 18 13:27:57 2010 +0100
b43: N-PHY: fix values for PHY regs in channel tables of 2055 radio
Additional comment by Larry Finger <Larry.Finger(a)lwfinger.net>:
This change deserves a bit more explanation. You might include something like
"These tables came from reverse engineering the 5.10.56.46 version of the
Broadcom driver. Trace comparisons between b43 and the current Broadcom driver
(5.10.120.0) show byte reversals for the PHY register writes."
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e9c0268f02f8970149158a9b7ea1e5c1c45c819d
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 16 19:56:49 2010 -0800
net/wireless: Use pr_<level> and netdev_<level>
No change in output for pr_<level> prefixes.
netdev_<level> output is different, arguably improved.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d7a066c92394f3e777351de0c903beeb8a08af76
Merge: ccb1435 e476a5a
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Nov 24 16:19:24 2010 -0500
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit ccb14354017272ddac002e859a2711610b6af174
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Wed Nov 24 16:18:36 2010 -0500
Revert "nl80211/mac80211: Report signal average"
This reverts commit 86107fd170bc379869250eb7e1bd393a3a70e8ae.
This patch inadvertantly changed the userland ABI.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1d24eb4815d1e0e8b451ecc546645f8ef1176d4f
Author: Tom Herbert <therbert(a)google.com>
Date: Sun Nov 21 13:17:27 2010 +0000
xps: Transmit Packet Steering
This patch implements transmit packet steering (XPS) for multiqueue
devices. XPS selects a transmit queue during packet transmission based
on configuration. This is done by mapping the CPU transmitting the
packet to a queue. This is the transmit side analogue to RPS-- where
RPS is selecting a CPU based on receive queue, XPS selects a queue
based on the CPU (previously there was an XPS patch from Eric
Dumazet, but that might more appropriately be called transmit completion
steering).
Each transmit queue can be associated with a number of CPUs which will
use the queue to send packets. This is configured as a CPU mask on a
per queue basis in:
/sys/class/net/eth<n>/queues/tx-<n>/xps_cpus
The mappings are stored per device in an inverted data structure that
maps CPUs to queues. In the netdevice structure this is an array of
num_possible_cpu structures where each structure holds and array of
queue_indexes for queues which that CPU can use.
The benefits of XPS are improved locality in the per queue data
structures. Also, transmit completions are more likely to be done
nearer to the sending thread, so this should promote locality back
to the socket on free (e.g. UDP). The benefits of XPS are dependent on
cache hierarchy, application load, and other factors. XPS would
nominally be configured so that a queue would only be shared by CPUs
which are sharing a cache, the degenerative configuration woud be that
each CPU has it's own queue.
Below are some benchmark results which show the potential benfit of
this patch. The netperf test has 500 instances of netperf TCP_RR test
with 1 byte req. and resp.
bnx2x on 16 core AMD
XPS (16 queues, 1 TX queue per CPU) 1234K at 100% CPU
No XPS (16 queues) 996K at 100% CPU
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3853b5841c01a3f492fe137afaad9c209e5162c6
Author: Tom Herbert <therbert(a)google.com>
Date: Sun Nov 21 13:17:29 2010 +0000
xps: Improvements in TX queue selection
In dev_pick_tx, don't do work in calculating queue
index or setting
the index in the sock unless the device has more than one queue. This
allows the sock to be set only with a queue index of a multi-queue
device which is desirable if device are stacked like in a tunnel.
We also allow the mapping of a socket to queue to be changed. To
maintain in order packet transmission a flag (ooo_okay) has been
added to the sk_buff structure. If a transport layer sets this flag
on a packet, the transmit queue can be changed for the socket.
Presumably, the transport would set this if there was no possbility
of creating OOO packets (for instance, there are no packets in flight
for the socket). This patch includes the modification in TCP output
for setting this flag.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 22f4fbd9bd283ef85126e511171932a4af703776
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 24 11:41:56 2010 -0800
infiniband: remove dev_base_lock use
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)
Convert rdma_translate_ip() and update_ipv6_gids() to RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Roland Dreier <rolandd(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bba14de98753cb6599a2dae0e520714b2153522d
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 23 14:09:15 2010 +0000
scm: lower SCM_MAX_FD
Lower SCM_MAX_FD from 255 to 253 so that allocations for scm_fp_list are
halved. (commit f8d570a4 added two pointers in this structure)
scm_fp_dup() should not copy whole structure (and trigger kmemcheck
warnings), but only the used part. While we are at it, only allocate
needed size.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 456b61bca8ee324ab6c18b065e632c9a8c88aa39
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 23 13:12:15 2010 +0000
ipv6: mcast: RCU conversion
ipv6_sk_mc_lock rwlock becomes a spinlock.
readers (inet6_mc_check()) now takes rcu_read_lock() instead of read
lock. Writers dont need to disable BH anymore.
struct ipv6_mc_socklist objects are reclaimed after one RCU grace
period.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2757a15f08adbed9480c30bdb4e9a0bbf2b6f33a
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:38:17 2010 +0000
stmmac: update the driver version
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 874bd42d24c2a74f5dbd65e81e175982240fecd8
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:38:11 2010 +0000
stmmac: convert to dev_pm_ops.
This patch updates the PM support using the dev_pm_ops
and reviews the hibernation support.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 293bb1c41b728d4aa248fe8a0acd2b9066ff5c34
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:38:05 2010 +0000
stmmac: add init/exit callback in plat_stmmacenet_data struct
This patch adds in the plat_stmmacenet_data
the init and exit callbacks that can be used
for invoking specific platform functions.
For example, on ST targets, these call the
PAD manager functions to set PIO lines and
syscfg registers.
The patch removes the stmmac_claim_resource
only used on STM Kernels as well.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9dfeb4d953f914bd3bb56ce60e22ee84687399ce
Author: Giuseppe CAVALLARO <peppe.cavallaro(a)st.com>
Date: Wed Nov 24 02:37:58 2010 +0000
stmmac: tidy-up stmmac_priv structure
This patch tidies-up the stmmac_priv structure
that had many fileds alredy defined in the
plat_stmmacenet_data structure.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b340007f79941297c44a7dfba4d3c587ff81590f
Author: Vladislav Zolotarov <vladz(a)broadcom.com>
Date: Wed Nov 24 11:09:50 2010 -0800
bnx2x: Do interrupt mode initialization and NAPIs adding before register_netdev()
Move the interrupt mode configuration and NAPIs adding before a
register_netdev() call to prevent netdev->open() from running
before these functions are done.
Advance a driver version number.
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Reported-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1210d127d11fc40d229648c9754aa60776ef796
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 24 03:45:10 2010 +0000
bnx2x: Disable local BHes to prevent a dead-lock situation
According to Eric's suggestion:
Disable local BHes to prevent a dead-lock situation between sch_direct_xmit()
(Soft_IRQ context) and bnx2x_tx_int (called by bnx2x_run_loopback() - syscall
context), as both are taking a netif_tx_lock().
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Vladislav Zolotarov <vladz(a)broadcom.com>
Signed-off-by: Eilon Greenstein <eilong(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 37a118452cbc9c0cf0d23bfd16d3ca56058be754
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:54 2010 +0000
tg3: Remove tg3_config_info definition
This structure isn't used anywhere in the driver.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2e1e3291d4727e14c8f0f48df561afb1a5c26ffe
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:53 2010 +0000
tg3: Enable phy APD for 5717 and later asic revs
This patch enables the gphy autopowerdown feature in the phy for all
new devices that support it.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4bae65c892b4ff9a2797cbfa8526a5f9aaf1b2ed
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:52 2010 +0000
tg3: use dma_alloc_coherent() instead of pci_alloc_consistent()
Using dma_alloc_coherent() permits to use GFP_KERNEL allocations instead
of GFP_ATOMIC ones. Its better when a machine is out of memory, because
this allows driver to sleep to get its memory and succeed its init,
especially when allocating high order pages.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b92b9040f6e4997b895b7b9c655a158354d28964
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:51 2010 +0000
tg3: Reenable TSS for 5719
All TSS bugs have been fixed in the 5719. This patch reenables the
feature.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit deabaac8beeccdfee5358c0cd4c63258f28f3a74
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:50 2010 +0000
tg3: Enable mult rd DMA engine on 5719
The multiple DMA read engine bugs have been fixed on the 5719. This
patch reenables support for this feature.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 07ae8fc00bcc97d2f896b257da225a0789b0aa5d
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:49 2010 +0000
tg3: Reorg tg3_napi members
This patch reorders and realigns the tg3_napi members for a ~3-4%
performance improvement on small packet performance tests.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cf79003d598b1f82a4caa0564107283b4f560e14
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:48 2010 +0000
tg3: Fix 5719 internal FIFO overflow problem
Under load, there an internal FIFO can overflow on the 5719. The fix is
to scale back the PCIe maximum read request size based on the current
link speed and width.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d2394e6bb1aa636f3bd142cb6f7845a4332514b5
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:47 2010 +0000
tg3: Always turn on APE features in mac_mode reg
The APE needs certain bits in the mac_mode register to be enabled for
traffic to flow correctly. This patch changes the code to always enable
these bits in the presence of the APE.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b75cc0e4c1caac63941d96a73b2214e8007b934b
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:46 2010 +0000
tg3: Assign correct tx margin for 5719
Commit d309a46e42542223946d3a9e4e239fdc945cb53e, entitled
"tg3: 5719: Prevent tx data corruption", was supposed to contain the tx
margin adjustment but it looks like it somehow was omitted. This patch
fixes the problem.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5093eedc8bdfd7d906836a44a248f66a99e27d22
Author: Matt Carlson <mcarlson(a)broadcom.com>
Date: Wed Nov 24 08:31:45 2010 +0000
tg3: Apply 10Mbps fix to all 57765 revisions
Commit a977dbe8445b8a81d6127c4aa9112a2c29a1a008, entitled
"tg3: Reduce 57765 core clock when link at 10Mbps" needs to be applied
to all revisions of the 57765 asic rev, not just the A0 revision.
Signed-off-by: Matt Carlson <mcarlson(a)broadcom.com>
Reviewed-by: Michael Chan <mchan(a)broadcom.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2fe66ec242d3f76e3b0101f36419e7e5405bcff3
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 23 06:28:08 2010 +0000
SELinux: indicate fatal error in compat netfilter code
The SELinux ip postroute code indicates when policy rejected a packet and
passes the error back up the stack. The compat code does not. This patch
sends the same kind of error back up the stack in the compat code.
Based-on-patch-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Reviewed-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 04f6d70f6e64900a5d70a5fc199dd9d5fa787738
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 23 06:28:02 2010 +0000
SELinux: Only return netlink error when we know the return is fatal
Some of the SELinux netlink code returns a fatal error when the error might
actually be transient. This patch just silently drops packets on
potentially transient errors but continues to return a permanant error
indicator when the denial was because of policy.
Based-on-comments-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Reviewed-by: Paul Moore <paul.moore(a)hp.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f8afa42b01c7a9f45b7cbaadb0481a0eeb96f18d
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 22 18:26:51 2010 +0100
ath9k_htc: fix eeprom access
wireless-testing commit a05b5d45049d60a06a1b12976150572304a51928
ath9k: add support for reading eeprom from platform data on PCI devices
This change moved the initialization of the AH_USE_EEPROM flag from ath9k_hw
to ath9k. This needs to be added to ath9k_htc as well
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 02d2ebb2a0aa2cae0446289c8f927067aec06079
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 22 15:39:39 2010 +0100
ath9k_hw: fix A-MPDU key search issues on AR9003
Under load, a large number of frames can produce decryption errors, even when
no key cache update is being done. Performing a key search for every single
frame in an A-MPDU improves reliability.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7253965a1cfbd22dd20f92b7a054e831777e284e
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:39:03 2010 -0800
zd1211rw: Use const
Mark arrays const that are unmodified after initializations.
text data bss dec hex filename
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.old
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f4e16e41d62ddc75704a0344567a807ebb41a929
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:39:01 2010 -0800
rt2x00: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
40197 56 8336 48589 bdcd drivers/net/wireless/rt2x00/rt2800lib.o.new
40205 56 8336 48597 bdd5 drivers/net/wireless/rt2x00/rt2800lib.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 22288a5847df30fb8ba298914f144c3b1d6e1fbe
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:39:00 2010 -0800
rndis_wlan: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
41757 2205 9896 53858 d262 drivers/net/wireless/rndis_wlan.o.old
41653 2205 9880 53738 d1ea drivers/net/wireless/rndis_wlan.o.new
Changed functions rndis_set_oid and set_bssid to take const *'s.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff273b91ff04e6f232234b70c45101074a0daa27
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:59 2010 -0800
ray_cs: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42607 3581 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.new
42603 3585 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 482e039f2a6546ee2ecf718ae6c02e84d1a7f00b
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:58 2010 -0800
libertas: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
3650 56 704 4410 113a drivers/net/wireless/libertas/rx.o.new
3695 56 704 4455 1167 drivers/net/wireless/libertas/rx.o.old
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.new
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 20407ed8a5bb271dd8e8bd4678e1d3dadeb318bd
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:57 2010 -0800
iwlwifi: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
48644 57 12120 60821 ed95 drivers/net/wireless/b43/phy_n.o.new
48661 57 12120 60838 eda6 drivers/net/wireless/b43/phy_n.o.old
37906 86 7904 45896 b348 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.new
37937 86 7904 45927 b367 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.old
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.new
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.old
Changed b43_nphy_write_clip_detection to take a const u16 *
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5b4bc649e18539a5d5a5482670d77f3f72de0eea
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:56 2010 -0800
b43: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
5502 56 1336 6894 1aee drivers/net/wireless/b43/phy_common.o.new
5511 56 1336 6903 1af7 drivers/net/wireless/b43/phy_common.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3370a895454ad814d0fb5f50352cea4e51d7392f
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:55 2010 -0800
atmel: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.old
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5653a63d85300dbed71b76ab7ada03808bdfb170
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:54 2010 -0800
carl9170: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.new
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.old
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 07b2fa5a2368accf0fe6cb16e7eca6d1150554ed
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:53 2010 -0800
ath9k: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11161 56 2136 13353 3429 drivers/net/wireless/ath/ath9k/ar9003_paprd.o.new
11167 56 2136 13359 342f drivers/net/wireless/ath/ath9k/ar9003_paprd.o.old
15428 56 3056 18540 486c drivers/net/wireless/ath/ath9k/eeprom_4k.o.old
15451 56 3056 18563 4883 drivers/net/wireless/ath/ath9k/eeprom_4k.o.new
14087 56 2560 16703 413f drivers/net/wireless/ath/ath9k/eeprom_9287.o.old
14036 56 2560 16652 410c drivers/net/wireless/ath/ath9k/eeprom_9287.o.new
10041 56 2384 12481 30c1 drivers/net/wireless/ath/ath9k/ani.o.new
10088 56 2384 12528 30f0 drivers/net/wireless/ath/ath9k/ani.o.old
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.new
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.old
16483 56 3432 19971 4e03 drivers/net/wireless/ath/ath9k/ar9003_phy.o.new
16517 56 3432 20005 4e25 drivers/net/wireless/ath/ath9k/ar9003_phy.o.old
18221 104 2960 21285 5325 drivers/net/wireless/ath/ath9k/rc.o.old
18203 104 2960 21267 5313 drivers/net/wireless/ath/ath9k/rc.o.new
19985 56 4288 24329 5f09 drivers/net/wireless/ath/ath9k/eeprom_def.o.new
20040 56 4288 24384 5f40 drivers/net/wireless/ath/ath9k/eeprom_def.o.old
23997 56 4984 29037 716d drivers/net/wireless/ath/ath9k/ar5008_phy.o.old
23846 56 4984 28886 70d6 drivers/net/wireless/ath/ath9k/ar5008_phy.o.new
24285 56 3184 27525 6b85 drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.old
24101 56 3184 27341 6acd drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.new
6834 56 1032 7922 1ef2 drivers/net/wireless/ath/ath9k/ar9002_phy.o.old
6780 56 1032 7868 1ebc drivers/net/wireless/ath/ath9k/ar9002_phy.o.new
36211 64 8624 44899 af63 drivers/net/wireless/ath/ath9k/hw.o.new
36401 64 8624 45089 b021 drivers/net/wireless/ath/ath9k/hw.o.old
9281 56 1496 10833 2a51 drivers/net/wireless/ath/ath9k/ar9003_calib.o.old
9150 56 1496 10702 29ce drivers/net/wireless/ath/ath9k/ar9003_calib.o.new
Use ARRAY_SIZE instead of a magic number.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8b22523b045858042c6700f556f840853de163ea
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:52 2010 -0800
ath5k: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11266 56 2464 13786 35da drivers/net/wireless/ath/ath5k/ani.o.old
11181 56 2464 13701 3585 drivers/net/wireless/ath/ath5k/ani.o.new
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 85be3d98dbc8d9cff9411c52c619c3752737b7b4
Author: Joe Perches <joe(a)perches.com>
Date: Sat Nov 20 18:38:51 2010 -0800
ar9170: Use const
Mark an array const.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a9ab21133581580f6907abbc33fd3870e75dc935
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Sat Nov 20 16:53:26 2010 +0100
carl9170: fix init-self regression
The commit: "carl9170: tx path review" introduced a regression.
gcc (with -Winit-self):
tx.c:1264: warning: ‘super’ is used uninitialized in this function
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3b1d6dfaaf89694c2aa56fe9a6b0f0221b98a209
Author: Huang Weiyi <weiyi.huang(a)gmail.com>
Date: Sat Nov 20 20:06:02 2010 +0800
libertas: remove duplicated #include
Remove duplicated #include('s) in
drivers/net/wireless/libertas/cfg.c
Signed-off-by: Huang Weiyi <weiyi.huang(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e1566d1f322b41b1ac3acf33407a0cfe2a311b75
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Nov 20 03:08:46 2010 +0100
ath9k: fix recursive locking in the tx flush path
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Tested-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b5bb2f2beb4d54597fd54075480fc4874a9c08dc
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Thu Nov 18 12:08:10 2010 -0800
iwlwifi: fix modular 3945 only build
If only 3945 is selected, and is a module, build
fails because iwl-legacy.c won't be compiled. Fix
this by adding it to the build correctly.
This doesn't happen for 4965 because it is a bool
option, not tristate, since it's built into the
AGN module.
Reported-by: Randy Dunlap <randy.dunlap(a)oracle.com>
Tested-by: Randy Dunlap <randy.dunlap(a)oracle.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 18890d4b89d8507ad09289f6f57a71591c7e9e83
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Fri Nov 19 08:11:01 2010 +0100
mac80211: Disable hw crypto for GTKs on AP VLAN interfaces
When using AP VLAN interfaces, each VLAN interface should be in its own
broadcast domain. Hostapd achieves this by assigning different GTKs to
different AP VLAN interfaces.
However, mac80211 drivers are not aware of AP VLAN interfaces and as
such mac80211 sends the GTK to the driver in the context of the base AP
mode interface. This causes problems when multiple AP VLAN interfaces
are used since the driver will use the same key slot for the different
GTKs (there's no way for the driver to distinguish the different GTKs
from different AP VLAN interfaces). Thus, only the clients associated
to one AP VLAN interface (the one that was created last) can actually
use broadcast traffic.
Fix this by not programming any GTKs for AP VLAN interfaces into the hw
but fall back to using software crypto. The GTK for the underlying AP
interface is still sent to the driver.
That means, broadcast traffic to stations associated to an AP VLAN
interface is encrypted in software whereas broadcast traffic to
stations associated to the non-VLAN AP interface is encrypted in
hardware.
Cc: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2e253cf300c5e33f49b7dd8b593bfc722177401
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:09 2010 -0800
cfg80211: Fix regulatory bug with multiple cards and delays
When two cards are connected with the same regulatory domain
if CRDA had a delayed response then cfg80211's own set regulatory
domain would still be the world regulatory domain. There was a bug
on cfg80211's logic such that it assumed that once you pegged a
request as the last request it was already the currently set
regulatory domain. This would mean we would race setting a stale
regulatory domain to secondary cards which had the same regulatory
domain since the alpha2 would match.
We fix this by processing each regulatory request atomically,
and only move on to the next one once we get it fully processed.
In the case CRDA is not present we will simply world roam.
This issue is only present when you have a slow system and the
CRDA processing is delayed. Because of this it is not a known
regression.
Without this fix when a delay is present with CRDA the second card
would end up with an intersected regulatory domain and not allow it
to use the channels it really is designed for. When two cards with
two different regulatory domains were inserted you'd end up
rejecting the second card's regulatory domain request.
This fails with mac80211_hswim's regtest=2 (two requests, same alpha2)
and regtest=3 (two requests, different alpha2) module parameter
options.
This was reproduced and tested against mac80211_hwsim using this
CRDA delayer:
#!/bin/bash
echo $COUNTRY >> /tmp/log
sleep 2
/sbin/crda.orig
And these regulatory tests:
modprobe mac80211_hwsim regtest=2
modprobe mac80211_hwsim regtest=3
Reported-by: Mark Mentovai <mark(a)moxienet.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b0e2880b0518ad11af20c7c93ec5cac93f9f03b0
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:08 2010 -0800
cfg80211: move mutex locking to reg_process_pending_hints()
This will be required in the next patch and it makes the
next patch easier to review.
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f333a7a2f49e2a9b46f8d18962bd750b18beeecd
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:07 2010 -0800
cfg80211: move reg_work and reg_todo above
These will be used earlier in the next few patches.
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 31e99729ae66d8b74316547c40eed15172f14ea8
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Nov 17 21:46:06 2010 -0800
cfg80211: put core regulatory request into queue
This will simplify the synchronization for pending requests.
Without this we have a race between the core and when we
restore regulatory settings, although this is unlikely
its best to just avoid that race altogether.
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Tested-by: Mark Mentovai <mark(a)moxienet.com>
Tested-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8ce469999552b0c3325350cd9b4be417f2bbfc23
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 17 22:14:37 2010 +0100
b43: rfkill: use HI enabled bit for all devices
Devices which use LO enabled bit are covered by b43legacy
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8933f90c777c5728822206a2313c9c1361f5274f
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Oct 14 22:58:58 2010 +0200
b43: N-PHY: add 2056 radio channels tables
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff
Merge: b84a7d3 9e2e742
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Nov 22 15:28:30 2010 -0500
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
commit eb06acdc85585f28864261f28659157848762ee4
Author: Sridhar Samudrala <sri(a)us.ibm.com>
Date: Thu Oct 28 13:10:50 2010 +0000
macvlan: Introduce 'passthru' mode to takeover the underlying device
With the current default 'vepa' mode, a KVM guest using virtio with
macvtap backend has the following limitations.
- cannot change/add a mac address on the guest virtio-net
- cannot create a vlan device on the guest virtio-net
- cannot enable promiscuous mode on guest virtio-net
To address these limitations, this patch introduces a new mode called
'passthru' when creating a macvlan device which allows takeover of the
underlying device and passing it to a guest using virtio with macvtap
backend.
Only one macvlan device is allowed in passthru mode and it inherits
the mac address from the underlying device and sets it in promiscuous
mode to receive and forward all the packets.
Signed-off-by: Sridhar Samudrala <sri(a)us.ibm.com>
-------------------------------------------------------------------------
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e5700c740da2cb9f5a3aa978cd1fa3a79916ba04
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:28 2010 +0000
Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fdb26195f494988fc155c204aab0f0953ba7ec6f
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:27 2010 +0000
Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9ed05ad3c0629f434b18d20c51162f9bbb4f5d31
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:26 2010 +0000
Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 094f2faaa2c4973e50979158f655a1d31a97ba98
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:25 2010 +0000
Net: rds: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched.
Last but not least, took out if-conditionals.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 927a41f50c83b539fde5c01911f4968d717199bf
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:24 2010 +0000
Net: phonet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 64387df8da1e4f178a47d53930288a46a357a479
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:23 2010 +0000
Net: lapb: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 94ee288e94ab31cefe2c5af3b59c25a1374ca3e5
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:22 2010 +0000
Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cd30c62024904951392e21a200fe5427a6286736
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:21 2010 +0000
Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f91c4ae4989322ed5cd10b5247e1a7bd3868a84e
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:20 2010 +0000
Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4de58dfebe6882dc1e8e8dc5ec062e28e99623cd
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:19 2010 +0000
Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6b8ff8c517008d93a6da62b106072a12dea8cb7c
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:18 2010 +0000
Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cc0bdac399b1881626cd5512f292e396c9c96685
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:17 2010 +0000
Net: econet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 22674a24b44ac53f244ef6edadd02021a270df5a
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:16 2010 +0000
Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fa13bc3daa5954ce58f68fd34fb1611df6ea6e6f
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:15 2010 +0000
Net: ceph: Makefile: remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bac14e017830bd204b3a1bd55f42b0841c02e995
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:14 2010 +0000
Net: can: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a3106d032fb17283c96fa041f8285e6926ae074d
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:13 2010 +0000
Net: caif: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
deprecated and should now be switched.
Last but not least, took out if-conditionals.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 87217502d4f45a9925c5eda5b2179f1220e87537
Author: Tracey Dent <tdent48227(a)gmail.com>
Date: Sun Nov 21 15:03:12 2010 +0000
Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Mon Nov 22 12:59:08 2010 +0200
wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc
On the disassociation event from the mac80211, the wl12xx driver does not
clear the chipset configuration related to the AP - i.e. it does not perform
a DISCONNECT and then a JOIN with zero SSID and dummy BSSID. Also, it does not
unset the BSSID filter.
Often this is not a problem, as the above is performed upon entering idle
state. But if a scenario arises where a new association is attempted without
cycling through idle state, the new association will fail.
Fix this by resetting the firmware state on disassociation.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 68d069c45f73e8aeda0249891daec1f7e2f0e067
Author: Arik Nemtsov <arik(a)wizery.com>
Date: Mon Nov 8 10:51:07 2010 +0100
wl1271: add support for HW TX fragmentation
Indicate to mac80211 we support HW fragmentation.
Support updates of the fragmentation threshold via the
set_frag_threshold callback.
Signed-off-by: Arik Nemtsov <arik(a)wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit fa97f46b30357a50f3ee193e6f82864f95bc55ec
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Wed Nov 10 11:27:20 2010 +0100
Revert "wl1271: Change supported channel order for a more optimal scan"
This reverts commit fa21c7a9e4be439e217fe72edbd39b643b643791.
The reverted patch caused more harm than benefit.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit b7417d930afdc214daa24299912d984e7f4f390a
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Wed Nov 10 11:27:19 2010 +0100
wl1271: Prevent ad-hoc and active scanning on 11a DFS frequencies
The wl1271 does not support radar detection. Hence, prevent ad-hoc and
active scanning on frequencies requiring DFS.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 91433029e42e58d8536299f32fa55cf589adff35
Author: Gery Kahn <geryk(a)ti.com>
Date: Sun Nov 7 10:04:20 2010 +0100
wl1271: cleanup unused code of calibration structures
The cleanup unused code for calibration procedures.
Signed-off-by: Gery Kahn <geryk(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 00d201001bd4e8a46e3d03c970abcb72256c368b
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Mon Nov 8 11:20:10 2010 +0000
wl1271: Change wl12xx Files Names
All files name prefix removed due to the fact that wl12xx driver supports
wl1271 and wl1273.
Also the definition in Kconfig and header files changed respectively.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 551eaff1b384cc107eab6332ba8424b3ca1f304b
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Nov 21 10:26:44 2010 -0800
pktgen: allow faster module unload
Unloading pktgen module needs ~6 seconds on a 64 cpus machine, to stop
64 kthreads.
Add a pktgen_exiting variable to let kernel threads die faster, so that
kthread_stop() doesnt have to wait too long for them. This variable is
not tested in fast path.
Note : Before exiting from pktgen_thread_worker(), we must make sure
kthread_stop() is waiting for this thread to be stopped, like its done
in kernel/softirq.c
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f
Author: Jan Engelhardt <jengelh(a)medozas.de>
Date: Sat Nov 20 18:07:21 2010 +0000
netns: let net_generic take pointer-to-const args
This commit is same in nature as v2.6.37-rc1-755-g3654654; the network
namespace itself is not modified when calling net_generic, so the
parameter can be const.
Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit bbce5a59e4e0e6e1dbc85492caaf310ff6611309
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sat Nov 20 07:31:54 2010 +0000
packet: use vzalloc()
alloc_one_pg_vec_page() is supposed to return zeroed memory, so use
vzalloc() instead of vmalloc()
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Neil Horman <nhorman(a)tuxdriver.com>
Acked-by: Neil Horman <nhorman(a)tuxdriver.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9a2d09cf61c9d9f1b31998bec5363a583e4564a4
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Sun Nov 21 09:55:10 2010 -0800
ixgbe: update version number for ixgbe
This will reflect addition of new X540 hardware
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 09c5088e5c5993be217a2c85dca088147ffc9b72
Author: Shreyas Bhatewara <sbhatewara(a)vmware.com>
Date: Fri Nov 19 10:55:24 2010 +0000
net-next: Add multiqueue support to vmxnet3 driver
Add multiqueue support to vmxnet3 driver
This change adds multiqueue and thus receive side scaling support
to vmxnet3 device driver. Number of rx queues is limited to 1 in cases
where MSI is not configured or one MSIx vector is not available per rx
queue
Signed-off-by: Shreyas Bhatewara <sbhatewara(a)vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh(a)vmware.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 24912420e923d56461b400d83f250a31bed8a964
Merge: 0670b8a 0302b86
Author: David S. Miller <davem(a)davemloft.net>
Date: Fri Nov 19 13:13:47 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
commit 0670b8ae66daf1d326c7bd10e73daff5f18fcf92
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:21:35 2010 +0000
X25: remove bkl in routing ioctls
Routing doesn't use the socket data and is protected by x25_route_list_lock
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 54aafbd4989a684ca876e49bf3e6eb931654dc02
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:21:28 2010 +0000
X25: remove bkl in inq and outq ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:21:20 2010 +0000
X25: remove bkl in timestamp ioctls
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 70be998c2b44f942f11383496622500136816acb
Author: andrew hendry <andrew.hendry(a)gmail.com>
Date: Thu Nov 18 13:20:57 2010 +0000
X25: pushdown bkl in ioctls
Push down the bkl in the ioctls so they can be removed one at a time.
Signed-off-by: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c26aed40f4fd18f86bcc6aba557cab700b129b73
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 18 22:04:46 2010 +0000
filter: use reciprocal divide
At compile time, we can replace the DIV_K instruction (divide by a
constant value) by a reciprocal divide.
At exec time, the expensive divide is replaced by a multiply, a less
expensive operation on most processors.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8c1592d68bc89248bfd0ee287648f41c1370d826
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 18 21:56:38 2010 +0000
filter: cleanup codes[] init
Starting the translated instruction to 1 instead of 0 allows us to
remove one descrement at check time and makes codes[] array init
cleaner.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 93aaae2e01e57483256b7da05c9a7ebd65ad4686
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Nov 19 09:49:59 2010 -0800
filter: optimize sk_run_filter
Remove pc variable to avoid arithmetic to compute fentry at each filter
instruction. Jumps directly manipulate fentry pointer.
As the last instruction of filter[] is guaranteed to be a RETURN, and
all jumps are before the last instruction, we dont need to check filter
bounds (number of instructions in filter array) at each iteration, so we
remove it from sk_run_filter() params.
On x86_32 remove f_k var introduced in commit 57fe93b374a6b871
(filter: make sure filters dont read uninitialized memory)
Note : We could use a CONFIG_ARCH_HAS_{FEW|MANY}_REGISTERS in order to
avoid too many ifdefs in this code.
This helps compiler to use cpu registers to hold fentry and A
accumulator.
On x86_32, this saves 401 bytes, and more important, sk_run_filter()
runs much faster because less register pressure (One less conditional
branch per BPF instruction)
# size net/core/filter.o net/core/filter_pre.o
text data bss dec hex filename
2948 0 0 2948 b84 net/core/filter.o
3349 0 0 3349 d15 net/core/filter_pre.o
on x86_64 :
# size net/core/filter.o net/core/filter_pre.o
text data bss dec hex filename
5173 0 0 5173 1435 net/core/filter.o
5224 0 0 5224 1468 net/core/filter_pre.o
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0a80410dc53cf68e56456bef1ca66949b87412f9
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Wed Nov 17 14:06:25 2010 +0000
can: EG20T PCH: use BIT(X)
Replace bit assignment value to BIT(X).
For easy to readable/identifiable, replace all bit assigned macros to BIT(X)
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 086b5650dcdaae7c4aa60a5d0724f775e733610e
Author: Tomoya <tomoya-linux(a)dsn.okisemi.com>
Date: Wed Nov 17 01:13:16 2010 +0000
can: EG20T PCH: add prefix to macro
For easy to readable/identifiable, add prefix "PCH_" to all of #define macros.
Signed-off-by: Tomoya MORINAGA <tomoya-linux(a)dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl(a)pengutronix.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 30dfe2c05037fbc021121c037872c09956938c2f
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Nov 18 11:49:25 2010 -0800
atm: fore200e: Fix build warning.
GCC (rightfully) complains that:
drivers/atm/fore200e.c:614:5: warning: operation on 'cmdq->head' may be undefined
This is due to the FORE200E_NEXT_ENTRY macro, which essentially
evaluates to:
i = ++i % m
Make it what's explicitly intended here which is:
i = (i + 1) % m
and the warning goes away.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a76a574ca9ce7c05791cee42f000f2a42c687837
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 17 19:52:13 2010 +0100
ssb: drop BCM4328 hack for SPROM revision
This hacks leads to incorrect SPROM parsing for me and reading for example MAC
as: 00:00:00:54:00:00. Michael G. who introduced this confirmed it is not
needed anymore.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Tested-by: Michael Gerdau <mgd(a)qata.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aaa13ca2428789b3c8096b5edc175d4d78b5f504
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Nov 17 04:19:47 2010 +0100
ath9k_hw: support reading calibration data from flash on AR9003
Embedded boards do not have compressed EEPROM data, they use the
struct ar9003_eeprom layout, with little endian fields, so copying
the raw data to the eeprom buffer is enough.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a05b5d45049d60a06a1b12976150572304a51928
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Nov 17 04:25:33 2010 +0100
ath9k: add support for reading eeprom from platform data on PCI devices
Some embedded boards store platform data for connected PCIe AR92xx
chips in the system flash instead of a separate EEPROM chip.
Signed-off-by: Gabor Juhos <juhosg(a)openwrt.org>
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 458fafdd579dcb58c8288c55c9cd92d6816ba094
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Nov 16 16:49:08 2010 -0500
rndis_wlan: avoid uninitialized var warning in rndis_wlan_craft_connected_bss
CC [M] drivers/net/wireless/rndis_wlan.o
drivers/net/wireless/rndis_wlan.c: In function ‘rndis_wlan_craft_connected_bss’:
drivers/net/wireless/rndis_wlan.c:2542:2: warning: ‘ret’ may be used uninitialized in this function
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
Acked-by: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
commit 8befba6f2262a6e31d6e3bcf7d07ff46da444ec0
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Tue Nov 16 16:08:56 2010 -0500
iwmc3200wifi: clarify potentially undefined operation in iwm_scan_ssids
CC [M] drivers/net/wireless/iwmc3200wifi/commands.o
drivers/net/wireless/iwmc3200wifi/commands.c: In function ‘iwm_scan_ssids’:
drivers/net/wireless/iwmc3200wifi/commands.c:911:15: warning: operation on ‘iwm->scan_id’ may be undefined
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 86107fd170bc379869250eb7e1bd393a3a70e8ae
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Nov 16 10:58:48 2010 +0900
nl80211/mac80211: Report signal average
Extend nl80211 to report an exponential weighted moving average (EWMA) of the
signal value. Since the signal value usually fluctuates between different
packets, an average can be more useful than the value of the last packet.
This uses the recently added generic EWMA library function.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit eef39befaae2a1559efe197d795c376a317af2af
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Nov 16 10:58:43 2010 +0900
ath5k: Use generic EWMA library
Remove ath5k's private moving average implementation in favour of the generic
library version.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c5485a7e7569ab32eea240c850198519e2a765ef
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Nov 16 10:58:37 2010 +0900
lib: Add generic exponentially weighted moving average (EWMA) function
This adds generic functions for calculating Exponentially Weighted Moving
Averages (EWMA). This implementation makes use of a structure which keeps the
EWMA parameters and a scaled up internal representation to reduce rounding
errors.
The original idea for this implementation came from the rt2x00 driver
(rt2x00link.c). I would like to use it in several places in the mac80211 and
ath5k code and I hope it can be useful in many other places in the kernel code.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 20:36:42 2010 +0000
igmp: refine skb allocations
IGMP allocates MTU sized skbs. This may fail for large MTU (order-2
allocations), so add a fallback to try lower sizes.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4c3710afbc333c33100739dec10662b4ee64e219
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Tue Nov 16 20:28:24 2010 +0000
net: move definitions of BPF_S_* to net/core/filter.c
BPF_S_* are used internally, should not be exposed to the others.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Hagen Paul Pfeifer <hagen(a)jauu.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cba328fc5ede9091616e7296483840869b615a46
Author: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
Date: Tue Nov 16 15:19:51 2010 +0000
filter: Optimize instruction revalidation code.
Since repeating u16 value to u8 value conversion using switch() clause's
case statement is wasteful, this patch introduces u16 to u8 mapping table
and removes most of case statements. As a result, the size of net/core/filter.o
is reduced by about 29% on x86.
Signed-off-by: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9e50e3ac5a5bbb1fd2949bdd57444ad1b93e5f41
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:12:28 2010 +0000
net: add priority field to pktgen
Add option to set skb priority to pktgen. Useful for testing
QOS features. Also by running pktgen on the vlan device the
qdisc on the real device can be tested.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f72f2f4cdeb67bc262d80a6d474292f00182a4dc
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Thu Nov 18 09:37:07 2010 -0800
dccp ccid-2: whitespace fix-up
This fixes whitespace noise introduced in commit "dccp ccid-2: Algorithm to
update buffer state", 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a, 14 Nov 2010.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 866f3b25a2eb60d7529c227a0ecd80c3aba443fd
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 18 09:33:19 2010 -0800
bonding: IGMP handling cleanup
Instead of iterating in_dev->mc_list from bonding driver, its better
to call a helper function provided by igmp.c
Details of implementation (locking) are private to igmp code.
ip_mc_rejoin_group(struct ip_mc_list *im) becomes
ip_mc_rejoin_groups(struct in_device *in_dev);
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 50a9432daeece6fc1309bef1dc0a7b8fde8204cb
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:50:28 2010 -0800
mac80211: fix powersaving clients races
The code to handle powersaving stations has a race:
when the powersave flag is lifted from a station,
we could transmit a packet that is being processed
for TX at the same time right away, even if there
are other frames queued for it. This would cause
frame reordering. To fix this, lift the flag only
under the appropriate lock that blocks TX.
Additionally, the code to allow drivers to block a
station while frames for it are on the HW queue is
never re-enabled the station, so traffic would get
stuck indefinitely. Fix this by clearing the flag
for this appropriately.
Finally, as an optimisation, don't do anything if
the driver unblocks an already unblocked station.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4bce22b9b84032c77c7e038b07b24fcc706dfc10
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Tue Nov 16 11:49:58 2010 -0800
mac80211: defines for AC numbers
In many places we've just hardcoded the
AC numbers -- which is a relic from the
original mac80211 (d80211). Add constants
for them so we know what we're talking
about.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Tue Nov 16 19:20:28 2010 +0100
ath9k_hw: add support for reading EEPROM data from the internal OTP ROM
Some of the new AR9003 cards do not come with an external EEPROM chip
anymore. Calibration data on these cards is stored in the OTP ROM on
the chip.
This patch adds support for reading this data, and also adds support
for different EEPROM chip sizes (512 bytes instead of 1K).
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d42efc44e38d3a8b2bf30e34559036bb6541672
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:13 2010 +0100
ath9k: store frame information used by aggregation inside the skb tx info
Since the pointers after the rates in the tx info cannot be used anymore
after frames have been queued, this area can be used to store information
that was previously stored in the ath_buf. With these changes, we can delay
the ath_buf assignment in the aggregation code until aggregates are formed.
That will not only make it possible to simplify DMA descriptor setup to
do less rewriting of uncached memory, but will also make it easier to
move aggregation out of the core of the ath9k tx path.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:12 2010 +0100
ath9k: more tx setup cleanups
- remove the BUF_HT flag, and instead check for IEEE80211_TX_CTL_AMPDU
before calling ath_tx_send_ampdu.
- remove a few unused variables
- calculate frame length before adding the frame padding
- merge the misnamed ath_tx_start_dma function into ath_tx_start
- remove an unused argument for assign_aggr_tid_seqno
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 71a3bf3e94b745467fc4c3451a294910f0369555
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:11 2010 +0100
ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set
This makes further tx path cleanups easier
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 28d167086227969fd6586953ee4ac682a3c394ff
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:10 2010 +0100
ath9k: clean up code duplication around ath_tx_start
Merge initial processing for the CAB queue and regular tx.
Also move ath_tx_cabq() to beacon.c and make it static.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c5992618259598ade82c386aa1595bf105e92d1f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:09 2010 +0100
ath9k: remove bf_tx_aborted from struct ath_buf
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 76e4522177de81ac89ade01a394aeb3704a66f1b
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:08 2010 +0100
ath9k: remove bfs_frmlen from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b572d0335fcb26e526f6ae087a9a09371b22e739
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:07 2010 +0100
ath9k: remove bfs_nframes from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 269c44bc8415ad78fb4dc3de25e6de3420332e9f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:06 2010 +0100
ath9k: remove bfs_al from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3017047f564d5101009c8318b94bdacd3ca3312e
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:05 2010 +0100
ath9k: remove bfs_keyix from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 82259b77f6e55c5b81f5f4a2852f6216c196ef30
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:04 2010 +0100
ath9k: remove bfs_paprd_timestamp from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 952cd693718d8ac796d5323fe7876241cf15ecfa
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:03 2010 +0100
ath9k: remove bfs_keytype from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5daefbd061d9509644058b6886abe2b6672ee386
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:02 2010 +0100
ath9k: remove bfs_tidno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d3bcba0827013dfc60f727e7370dea00bc0638a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 15:20:01 2010 +0100
ath9k: remove bfs_seqno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9a6b82706317333a1fab5dcafa2c33b91253a7a2
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 14 00:03:01 2010 +0100
ath9k: fix PA predistortion training frame setup
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c5d0855acfa4d6801c4c45bc02ddddd959262050
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Nov 13 20:22:41 2010 +0100
ath9k_hw: set default values for radar pulse detection
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 387e68846413f3dcfc5a5afca9841430057e3340
Author: RA-Jay Hung <Jay_Hung(a)ralinktech.com>
Date: Sat Nov 13 19:13:53 2010 +0100
rt2x00: Modify rt2x00queue_remove_l2pad to make skb->data two-byte alignment
When send out skb data to mac80211, orignal code will cause mac80211
unaligned access, so modify code to make mac80211 can natural access.
Signed-off-by: RA-Jay Hung <jay_hung(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a
Author: RA-Jay Hung <Jay_Hung(a)ralinktech.com>
Date: Sat Nov 13 19:12:54 2010 +0100
rt2x00: Fix header_length in rt2x00lib_txdone
Put the assignment of header_length after pull out extra tx headroom
Signed-off-by: RA-Jay Hung <jay_hung(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b43d63bd69ae5464a52bf1796e84097607917b2f
Author: RA-Jay Hung <Jay_Hung(a)ralinktech.com>
Date: Sat Nov 13 19:11:46 2010 +0100
rt2x00: Fix rt2800 USB TX Path DMA issue
rt2800usb chips need to add 1~3 bytes zero padding after each 802.11 header & payload,
and at the end need to add 4 bytes zero padding whether doing TX bulk aggregation or not,
TXINFO_W0_USB_DMA_TX_PKT_LEN in TXINFO must include 1-3 bytes padding after 802.11 header & payload
but do not include 4 bytes end zero padding.
In rt2800usb_get_tx_data_len do not consider multiple of the USB packet size case, sometimes this will
cause USB DMA problem.
Signed-off-by: RA-Jay Hung <jay_hung(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ef8397cfb3a385bc57a32213d0e4a5b7903a9dc6
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:11:22 2010 +0100
rt2x00: Use ioremap for SoC devices instead of KSEG1ADDR.
Make the code a bit more portable to architectures that do not support
KSEG1ADDR.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Tested-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 72c7296e03e381b49958809915105b18b09fa7a3
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:10:54 2010 +0100
rt2x00: Remove unneccessary internal Kconfig symbols.
CONFIG_RT2800PCI_PCI and CONFIG_RT2800PCI_SOC are strictly not needed
as we can check the dependent symbols directly in the rest of Kconfig
and the code, so clean up the Kconfig namespace a bit.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a6a8d66ebaea1e78d779af221bd6f01c5cbe71f5
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:10:31 2010 +0100
rt2x00: Remove RT30XX Kconfig variables.
Enabling of RT30xx devices via Kconfig variables was introduced when these
devices weren't properly supported yet.
Now that that they are properly supported and functional, we can remove these
Kconfig variables for RT30xx devices and simply enable them whenever rt2800pci
and/or rt2800usb is enabled.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 46af584d2ea86518c4cdf521903cd93ba6de2ec0
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:10:10 2010 +0100
rt2x00: Clean up Kconfig for RT2800 devices.
General clean up of the Kconfig part for RT28XX devices.
Also remove the indications of non functional support for rt27xx/rt28xx/rt30xx
devices, as this is no longer true. They just work fine.
Finally, remove the experimental indications for rt27xx/rt28xx/rt30xx devices
as that is no longer true. Keep the experimental indications for rt33xx/rt35xx
devices, though.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f93bc9b3ce379800b30b3c2f4fc945ae35a80039
Author: Gertjan van Wingerde <gwingerde(a)gmail.com>
Date: Sat Nov 13 19:09:50 2010 +0100
rt2x00: Add initial support for RT3370/RT3390 devices.
Modified from Eddy's patch by adding the RT3370 USB support as well.
Signed-off-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Cc: Eddy Tsai <Eddy_Tsai(a)ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae4ecb9f8f01eb9deffb5bd837dc90f4e646cd2d
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Sat Nov 13 19:08:14 2010 +0100
rt2x00: Increase REGISTER_BUSY_COUNT
For some hardware the REGISTER_BUSY_COUNT isn't sufficient,
increase the REGISTER_BUSY_COUNT to 100 to catch most
devices which have more problems with accessing the registers.
For normal operating devices nothing would change as they will
exit the loop early anyway.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dda0b38692a7298f433b92b1329867b1ecabb4bb
Author: Vasiliy Kulikov <segoon(a)openwall.com>
Date: Sun Nov 14 07:06:08 2010 +0000
net: ipv4: tcp_probe: cleanup snprintf() use
snprintf() returns number of bytes that were copied if there is no overflow.
This code uses return value as number of copied bytes. Theoretically format
string '%lu.%09lu %pI4:%u %pI4:%u %d %#x %#x %u %u %u %u\n' may be expanded
up to 163 bytes. In reality tv.tv_sec is just few bytes instead of 20, 2 ports
are just 5 bytes each instead of 10, length is 5 bytes instead of 10. The rest
is an unstrusted input. Theoretically if tv_sec is big then copy_to_user() would
overflow tbuf.
tbuf was increased to fit in 163 bytes. snprintf() is used to follow return
value semantic.
Signed-off-by: Vasiliy Kulikov <segoon(a)openwall.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9ea19481db31d614f729f346bdcf28e4e60ff14a
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 06:31:39 2010 +0000
net: zero kobject in rx_queue_release
netif_set_real_num_rx_queues() can decrement and increment
the number of rx queues. For example ixgbe does this as
features and offloads are toggled. Presumably this could
also happen across down/up on most devices if the available
resources changed (cpu offlined).
The kobject needs to be zero'd in this case so that the
state is not preserved across kobject_put()/kobject_init_and_add().
This resolves the following error report.
ixgbe 0000:03:00.0: eth2: NIC Link is Up 10 Gbps, Flow Control: RX/TX
kobject (ffff880324b83210): tried to init an initialized object, something is seriously wrong.
Pid: 1972, comm: lldpad Not tainted 2.6.37-rc18021qaz+ #169
Call Trace:
[<ffffffff8121c940>] kobject_init+0x3a/0x83
[<ffffffff8121cf77>] kobject_init_and_add+0x23/0x57
[<ffffffff8107b800>] ? mark_lock+0x21/0x267
[<ffffffff813c6d11>] net_rx_queue_update_kobjects+0x63/0xc6
[<ffffffff813b5e0e>] netif_set_real_num_rx_queues+0x5f/0x78
[<ffffffffa0261d49>] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe]
[<ffffffffa0262509>] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe]
[<ffffffffa0274596>] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe]
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5811662b15db018c740c57d037523683fd3e6123
Author: Changli Gao <xiaosuo(a)gmail.com>
Date: Fri Nov 12 18:43:55 2010 +0000
net: use the macros defined for the members of flowi
Use the macros defined for the members of flowi to clean the code up.
Signed-off-by: Changli Gao <xiaosuo(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit dd68ad2235b4625e0dc928b2b4c614d265f976d3
Author: Philippe De Muyter <phdm(a)macqel.be>
Date: Sat Nov 13 08:43:29 2010 +0000
net: more Kconfig whitespace cleanup
indentation for TSI108_ETH entry was too big.
Signed-off-by: Philippe De Muyter <phdm(a)macqel.be>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b1323c8fa153f63e20d5a7fc0be72073c3beb05b
Author: Joe Perches <joe(a)perches.com>
Date: Fri Nov 12 11:37:59 2010 +0000
drivers/net/can/sja1000: Use printf extension %pR for struct resource
Using %pR standardizes the struct resource output.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d8ee707114bc3615fd7be90eb942eba2dbe668ed
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 10:13:58 2010 +0000
drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a31ff3880578c37fd5c71ee863c23897dacfa9f8
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 10:13:57 2010 +0000
drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 802aa9c058f2046f0a5683f04d7755c362734010
Author: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Date: Tue Nov 16 14:09:06 2010 +0000
qlcnic: Bumped up driver version to 5.0.12
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 706f23ada68746ed475488e7d2e2ca392fc4f731
Author: Sony Chacko <sony.chacko(a)qlogic.com>
Date: Tue Nov 16 14:08:46 2010 +0000
qlcnic: lro off message log from set rx checsum
Log LRO off message while disabling rx checksum only when
LRO is already enabled.
Signed-off-by: Sony Chacko <sony.chacko(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2679a135e6452359cd807754617db0d05ad404e5
Author: Sritej Velaga <sritej.velaga(a)qlogic.com>
Date: Tue Nov 16 14:08:23 2010 +0000
qlcnic: Add description for CN1000Q adapter
Add description for CN1000Q adapter
Signed-off-by: Sritej Velaga <sritej.velaga(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c21fd48c22bd1a9c4a5286963086f246c782e47e
Author: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Date: Tue Nov 16 14:08:06 2010 +0000
qlcnic: Fix for kdump
In case of kdump environment the function may be in unknown state.
Reset the function using PCI FLR before initializing it.
Signed-off-by: Rajesh Borundia <rajesh.borundia(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2abea2f0a5ab161facd865356d2e59b23204414e
Author: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Date: Tue Nov 16 14:07:53 2010 +0000
qlcnic: Allow minimum bandwidth of zero
Allow minimum bandwidth to be set zero
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty(a)qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b382b191ea9e9ccefc437433d23befe91f4a8925
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:33:57 2010 +0000
ipv6: AF_INET6 link address family
IPv6 already exposes some address family data via netlink in the
IFLA_PROTINFO attribute if RTM_GETLINK request is sent with the
address family set to AF_INET6. We take over this format and
reuse all the code.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Cc: YOSHIFUJI Hideaki <yoshfuji(a)linux-ipv6.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9f0f7272ac9506f4c8c05cc597b7e376b0b9f3e4
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:32:48 2010 +0000
ipv4: AF_INET link address family
Implements the AF_INET link address family exposing the per
device configuration settings via netlink using the attribute
IFLA_INET_CONF.
The format of IFLA_INET_CONF differs depending on the direction
the attribute is sent. The attribute sent by the kernel consists
of a u32 array, basically a 1:1 copy of in_device->cnf.data[].
The attribute expected by the kernel must consist of a sequence
of nested u32 attributes, each representing a change request,
e.g.
[IFLA_INET_CONF] = {
[IPV4_DEVCONF_FORWARDING] = 1,
[IPV4_DEVCONF_NOXFRM] = 0,
}
libnl userspace API documentation and example available from:
http://www.infradead.org/~tgr/libnl/doc-git/group__link__inet.html
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca7479ebbd9f7621646bf2792cb7143647f035bb
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:31:20 2010 +0000
inet: Define IPV4_DEVCONF_MAX
Define IPV4_DEVCONF_MAX to get rid of MAX - 1 notation.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f8ff182c716c6f11ca3061961f5722f26a14e101
Author: Thomas Graf <tgraf(a)infradead.org>
Date: Tue Nov 16 04:30:14 2010 +0000
rtnetlink: Link address family API
Each net_device contains address family specific data such as
per device settings and statistics. We already expose this data
via procfs/sysfs and partially netlink.
The netlink method requires the requester to send one RTM_GETLINK
request for each address family it wishes to receive data of
and then merge this data itself.
This patch implements a new API which combines all address family
specific link data in a new netlink attribute IFLA_AF_SPEC.
IFLA_AF_SPEC contains a sequence of nested attributes, one for each
address family which in turn defines the structure of its own
attribute. Example:
[IFLA_AF_SPEC] = {
[AF_INET] = {
[IFLA_INET_CONF] = ...,
},
[AF_INET6] = {
[IFLA_INET6_FLAGS] = ...,
[IFLA_INET6_CONF] = ...,
}
}
The API also allows for address families to implement a function
which parses the IFLA_AF_SPEC attribute sent by userspace to
implement address family specific link options.
Signed-off-by: Thomas Graf <tgraf(a)infradead.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d67ef35fff67845c64d806c033cc7c569ccebfff
Author: Jeremy Eder <jeder(a)redhat.com>
Date: Mon Nov 15 05:41:31 2010 +0000
clarify documentation for net.ipv4.igmp_max_memberships
This patch helps clarify documentation for
net.ipv4.igmp_max_memberships by providing a formula for
calculating the maximum number of multicast groups that can be
subscribed to, plus defining the theoretical limit.
Signed-off-by: Jiri Pirko <jpirko(a)redhat.com>
Signed-off-by: Jeremy Eder <jeder(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9920239c90d5f6dadfb44325abf3568a5e3fd827
Author: Joe Perches <joe(a)perches.com>
Date: Wed Nov 10 18:54:58 2010 +0000
drivers/isdn/hisax: Add printf format/argument verification and fix fallout
Add __attribute__((format... to several functins
Make formats and arguments match.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1f1aaf82825865a50cef0b4722607abb12aeee52
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 16 11:52:57 2010 +0000
SELinux: return -ECONNREFUSED from ip_postroute to signal fatal error
The SELinux netfilter hooks just return NF_DROP if they drop a packet. We
want to signal that a drop in this hook is a permanant fatal error and is not
transient. If we do this the error will be passed back up the stack in some
places and applications will get a faster interaction that something went
wrong.
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ee58681195bf243bafc44ca53f3c24429d096cce
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 16 11:52:49 2010 +0000
network: tcp_connect should return certain errors up the stack
The current tcp_connect code completely ignores errors from sending an skb.
This makes sense in many situations (like -ENOBUFFS) but I want to be able to
immediately fail connections if they are denied by the SELinux netfilter hook.
Netfilter does not normally return ECONNREFUSED when it drops a packet so we
respect that error code as a final and fatal error that can not be recovered.
Based-on-patch-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit da6836500414ae734cd9873c2d553db594f831e9
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Nov 16 11:52:38 2010 +0000
netfilter: allow hooks to pass error code back up the stack
SELinux would like to pass certain fatal errors back up the stack. This patch
implements the generic netfilter support for this functionality.
Based-on-patch-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: Eric Paris <eparis(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 37d668004289d202f71dc5bfdadf6c18b34577a2
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:33 2010 +0000
net/atm: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ece49153b601d95bcebd45a6394e370972f0b0a0
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:31 2010 +0000
drivers/net: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5f54cebb13cdb8dcd85036f8bee29f14db18b6e1
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:30 2010 +0000
drivers/net/vxge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8739cfef1ab8bc02e1bf38c02399afe62f3a7800
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:29 2010 +0000
drivers/net/usb: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b16fed0af8416ee0fe9af6c1977f7b05e7e7c9b2
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:28 2010 +0000
drivers/net/qlge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4dd151876b6b81040121708ebc23c6cd1a3d5be8
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:27 2010 +0000
drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a887e220760c12e00b0591d67987e26f6e270d71
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:26 2010 +0000
drivers/net/pcmcia: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c04914af6861d62df303aeedbbe554972ce4e736
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:25 2010 +0000
drivers/net/bonding: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a17531fa4c951f32ca4f90b04ca42cfb11924098
Author: Joe Perches <joe(a)perches.com>
Date: Mon Nov 15 11:12:24 2010 +0000
drivers/isdn/i4l: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a1082bfe7d2d88d9626f5542dda9c0781394e91f
Merge: 9d1e5e4 147b2c8
Author: David S. Miller <davem(a)davemloft.net>
Date: Wed Nov 17 09:56:04 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
commit 147b2c8cb4f3e16aafc87096365a913d01ee3a21
Author: Dongdong Deng <dongdong.deng(a)windriver.com>
Date: Tue Nov 16 19:50:15 2010 -0800
e1000e: add netpoll support for MSI/MSI-X IRQ modes
With enabling CONFIG_PCI_MSI, e1000e could work in MSI/MSI-X IRQ mode,
and netpoll controller didn't deal with those IRQ modes on e1000e.
This patch add the handling MSI/MSI-X IRQ modes to netpoll controller,
so that netconsole could work with those IRQ modes.
Signed-off-by: Dongdong Deng <dongdong.deng(a)windriver.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 1b98c2bb63a4b415d8d894d001b6d0256409e0d9
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Tue Nov 16 19:50:14 2010 -0800
e1000e: 82574 intermittently fails to initialize with manageability f/w
The driver can fail initializing the hardware when manageability firmware
is performing concurrent MDIO operations because the hardware semaphore
scheme to prevent concurrent operations between software and firmware is
incorrect for 82574/82583. Instead of using the SWSM register, the driver
should be using the EXTCNF_CTRL register. A software mutex is also added
to prevent simultaneous software threads from performing similar concurrent
accesses.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d478eb44f7a6b53256ae399fa7e597525b4034ee
Author: Bruce Allan <bruce.w.allan(a)intel.com>
Date: Tue Nov 16 19:50:13 2010 -0800
e1000e: 82571 SerDes link handle null code word from partner
SerDes Link detection on certain 82571 mezzanine cards can fail when the
link is forced, the link partner does not recognize forced link and the
link partner sends null code words. Detect the null code words and return
to auto-negotiation state which causes the link partner to begin responding
with valid code words. Within a reasonable interval the link will finally
settle as forced by both partners.
Signed-off-by: Bruce Allan <bruce.w.allan(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b1d670f10e8078485884f0cf7e384d890909aeaa
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:41:36 2010 -0800
Remove extra struct page member from the buffer info structure
declaration.
Reported-by: Andi Kleen <andi(a)firstfloor.org>
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit eca2a33c985eb19dd0ca4b37d66c7fb5d8b76308
Author: Julian Stecklina <jsteckli(a)os.inf.tu-dresden.de>
Date: Tue Nov 16 19:41:36 2010 -0800
igbvf: Remove some dead code in igbvf
Removed unused variable in igbvf.
Signed-off-by: Julian Stecklina <jsteckli(a)os.inf.tu-dresden.de>
Acked-by: Greg Rose <greg.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 2c20ebbaed7f3f21506629ee931941a9bba199ab
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:41:35 2010 -0800
igbvf: Update version and Copyright
Update version string and copyright notice
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:27:19 2010 -0800
ixgbevf: Fix Oops
The driver is calling netif_carrier_off and netif_tx_stop_all_queues
before the netdevice is registered which causes an Oops. Move call
to netif_carrier_off after the netdevice is registered and remove
call to netif_tx_stop_all_queues because there aren't any TX
queues yet.
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e2ddeba95c09d0d44719ff005e915dc06ff46571
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 19:27:18 2010 -0800
ixgbe: refactor ixgbe_alloc_queues()
I noticed ring variable was initialized before allocations, and that
memory node management was a bit ugly. We also leak memory in case of
ring allocations error.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b93a22260f6f4bcf6c92c54de8530a97d3e921f0
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Tue Nov 16 19:27:17 2010 -0800
ixgbe: add support for x540 MAC
This patch adds support for the x540 MAC which is the next MAC in the
82598/82599 line.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit fe15e8e1c78521e0b4e375d6ed415b82265419c9
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Tue Nov 16 19:27:16 2010 -0800
ixgbe: add MAC and PHY support for x540
Adds the new x540.c file and Aquantia 1202 PHY for X540 support.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a391f1d51244b8274920a33c5d11aeebec3aa68f
Author: Don Skidmore <donald.c.skidmore(a)intel.com>
Date: Tue Nov 16 19:27:15 2010 -0800
ixgbe: make silicon specific functions generic
The new MAC type X540 shares much of the same functionality of
some silicon specific functions. To reduce duplicate code,
made these functions generic.
Signed-off-by: Don Skidmore <donald.c.skidmore(a)intel.com>
Tested-by: Stephen Ko <stephen.s.ko(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9b55bb038468a7b504ccdc1d956952598ae1b85b
Author: Yi Zou <yi.zou(a)intel.com>
Date: Tue Nov 16 19:27:14 2010 -0800
ixgbe: make sure FCoE DDP user buffers are really released by the HW
When invalidating the DDP context is invalidated, the HW may not be done
with the user buffer right away. In which case, we poll the FCBUFF register
to check if the buffer valid bit is cleared or not, if not, we wait for max
100us that is guaranteed by the HW.
Signed-off-by: Yi Zou <yi.zou(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 8ca371e484e2e5ceb9b90fdb83d8d251017d852b
Author: Yi Zou <yi.zou(a)intel.com>
Date: Tue Nov 16 19:27:13 2010 -0800
ixgbe: invalidate FCoE DDP context when no error status is available
The hw automatically invalidates the context if DDP is successful or there is
error detected. In case there is no error status available from the hw,
initializing the per context error status to be 1 allows the DDP context to be
still invalidated via the upper layer call to ddp_put().
Signed-off-by: Yi Zou <yi.zou(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit a41c059741570779c0254a3a1aa4da3baa463d7c
Author: Yi Zou <yi.zou(a)intel.com>
Date: Tue Nov 16 19:27:13 2010 -0800
ixgbe: avoid doing FCoE DDP when adapter is DOWN or RESETTING
There is no point to allow incoming DDP requests from the upper layer stack if
the adapter is going down or being reset.
Signed-off-by: Yi Zou <yi.zou(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c84d324c770dc81acebc1042163da33c8ded2364
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:27:12 2010 -0800
ixgbe: rework Tx hang detection to fix reoccurring false Tx hangs
The Tx hang logic has been known to detect false hangs when
the device is receiving pause frames or has delayed processing
for some other reason.
This patch makes the logic more robust and resolves these
known issues. The old logic checked to see if the device
was paused by querying the HW then the hang logic was
aborted if the device was currently paused. This check was
racy because the device could have been in the pause state
any time up to this check. The other operation of the
hang logic is to verify the Tx ring is still advancing
the old logic checked the EOP timestamp. This is not
sufficient to determine the ring is not advancing but
only infers that it may be moving slowly.
Here we add logic to track the number of completed Tx
descriptors and use the adapter stats to check if any
pause frames have been received since the previous Tx
hang check. This way we avoid racing with the HW
register and do not detect false hangs if the ring is
advancing slowly.
This patch is primarily the work of Jesse Brandeburg. I
clean it up some and fixed the PFC checking.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e3de4b7bdfd2c06884c95cfb4ad4d64be046595e
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:11 2010 -0800
ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed fiber
This change resolves some null function pointer accesses on 82598 when a
multi-speed fiber module is inserted into the adapter.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 2274543f15133165b855b9a4a1503b2c1268c6cf
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:10 2010 -0800
ixgbe: populate the ring->q_vector pointer during ring mapping
The q_vector back pointer was not being set in the rings so it would not
have been possible to determine the parent q_vector of the ring.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d0759ebb051972f8557a19aa13cf02fc314856e9
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:09 2010 -0800
ixgbe: cleanup ixgbe_map_rings_to_vectors
This change cleans up some of the items in ixgbe_map_rings_to_vectors.
Specifically it merges the two for loops and drops the unnecessary vectors
parameter.
It also moves the vector names into the q_vectors themselves.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 125601bf03a13e24d3785ccbc3a25ad401c92772
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:08 2010 -0800
ixgbe: simplify math and improve stack use of ixgbe_set_itr functions
This change is meant to improve the stack utilization and simplify the math
used in ixgbe_set_itr_msix.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit bf29ee6c4819a86ba0209281550b230889b8ebe6
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:07 2010 -0800
ixgbe: cleanup unclear references to reg_idx
There are a number of places where we use the variable j to contain the
register index of the ring. Instead of using such a non-descriptive
variable name it is better that we name it reg_idx so that it is clear what
the variable contains.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 9d6b758f428d2ad9ca4208d5c4d4cdbd4261b0d8
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:06 2010 -0800
ixgbe: cleanup unnecessary return value in ixgbe_cache_ring_rss
This change is just to cleanup some confusing logic in ixgbe_cache_ring_rss
which can be simplified by adding a conditional with return to the start of
the call.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 673ac60461082e07be58b23f237d651c2605ce60
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:05 2010 -0800
ixgbe: Cleanup DCB logic, whitespace, and comments in ixgbe_ethtool.c
This change address a few whitespace issues in DCB #ifdefs, adds a comment
calling out the DCB specific registers, and nests an if statement inline
with a number of if statements related to flow control.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 50d6c681d0c38208e494f0c6302ef13d21dababa
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:05 2010 -0800
ixgbe: add WOL support for backplane adapters
This change adds support for certain 82599 based Mezzanine adapters.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit e2b4e216b7e9da09175c76887c754489681533b9
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:04 2010 -0800
ixgbe: cleanup ixgbe_set_tx_csum ethtool flags configuration
This change makes it so that we always disable SCTP regardless of mac type
since we shouldn't need to check mac type before disabling a feature that
isn't supported on a given piece of hardware.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit bd50817859e7e82ba6e4adc75ebd8ac19459d8a4
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:03 2010 -0800
ixgbe: change mac_type if statements to switch statements
This change replaces a number of if/elseif/else statements with switch
statements to support the addition of future devices to the ixgbe driver.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit aa80175a539a47fd11e2fbf1696a29f7a2652930
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:02 2010 -0800
ixgbe: cleanup use of ixgbe_rsc_count and RSC_CB
This change cleans up the use of rsc_count and changes it to a boolean since
the actual numerical value is used nowhere in the Rx cleanup path. I am
also moving the skb count into the RSC_CB path since it is much easier to
track it there than when it is passed as a parameter to various function
calls.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit ee9e0f0b40c4fb4ad71d677c094d518db42f7076
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:01 2010 -0800
ixgbe: cleanup ATR filter setup function
This change cleans up the ixgbe_atr filter setup function so that it uses
fewer items from the stack. Since the code is only applicable to IPv4 w/
TCP it makes sense to just use the pointers based on the headers themselves
instead of copying them to temp variables and then writing those to the
filters.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c267fc166a3308c45c7f0ad2ddd6fc696caaeb80
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:27:00 2010 -0800
ixgbe: cleanup ixgbe_clean_rx_irq
The code for ixgbe_clean_rx_irq was much more tangled up than it needed to
be in terms of logic statements and unused variables. This change
untangles much of that and drops several unused variables such as cleaned
which was being returned but never checked.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 32aa77a4fc06bd1116f83c25bf0389a3e9b80533
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:59 2010 -0800
ixgbe: change vector numbering so that queues end up on correct CPUs
This changes the numbering scheme slightly. Previously the ordering was
coming out like this:
Rx-2
Rx-1
Rx-0
TxRx-0
Which would drop two queues on CPU 0. This change makes it so that the
ordering is like this:
Rx-3
Rx-2
Rx-1
TxRx-0
This means that each CPU will have it's own Rx queue, and only CPU 0 will
have the Tx queue.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b953799ee29075afd30afe4c0fb65f278b088f69
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:58 2010 -0800
ixgbe: reorder Tx cleanup so that if adapter will reset we don't rearm
The code as it existed could re-arm the queues when it was requesting a HW
reset due to a TX hang. Instead of doing that this change makes it so that
we will just exit if the hardware is believed to be hung.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 80fba3f4341b1c98430bee620b507d3f5b7086cd
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:57 2010 -0800
ixgbe: Disable RSC when ITR setting is too high to allow RSC
RSC will flush its descriptors every time the interrupt throttle timer
expires. In addition there are known issues with RSC when the rx-usecs
value is set too low. As such we are forced to clear the RSC_ENABLED bit
and reset the adapter when the rx-usecs value is set too low.
However we do not need to clear the NETIF_F_LRO flag because it is used to
indicate that the user wants to leave the LRO feature enabled, and in fact
with this change we will now re-enable RSC as soon as the rx-usecs value is
increased and the flag is still set.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 73c4b7cdd25a8a769baf6dae5bc498400a9ddd93
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:57 2010 -0800
ixgbe: cleanup race conditions in link setup
This change makes it so that we perform link setup with interrupts
disabled. If the SFP has not been detected previously we will schedule the
SFP detection task to run in order to detect link. By doing this we avoid
the possibility of interrupts firing in the middle of our link setup during
ixgbe_up_complete.
In addition this change makes it so that the multi-speed fiber setup and SFP
setup are not mutually exclusive. The addresses issues seen in which a
link would only come up at 1G on some multi-speed fiber modules.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 7d637bcc8f461f19e1d018078792ec0cd9b07b1d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:56 2010 -0800
ixgbe: add a state flags to ring
This change adds a set of state flags to the rings that allow them to
independently function allowing for features like RSC, packet split, and
TX hang detection to be done per ring instead of for the entire device.
This is accomplished by re-purposing the flow director reinit_state member
and making it a global state instead since a long for a single bit flag is
a bit wasteful.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 33cf09c9586a0dce472ecd2aac13e8140c9ed1a1
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:55 2010 -0800
ixgbe: move CPU variable from ring into q_vector, add ring->q_vector
This is the start of work to sort out what belongs in the rings and what
belongs in the q_vector. Items like the CPU variable for make much more
sense in the q_vector since the CPU is a per-interrupt thing rather than a
per ring thing.
I also added a back-pointer from the ring to the q_vector.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit c60fbb00f0400792adf873dbacd431885653b77d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:54 2010 -0800
ixgbe: move adapter into pci_dev driver data instead of netdev
This change moves an adapter pointer into the private portion of the
pci_dev instead of a pointer to the netdev. The reason for this change is
because in most cases we just want the adapter anyway. In addition as we
start moving toward multiple netdevs per port we may want to move the
adapter pointer out of the netdevs entirely.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 01fa7d905fe9a5b045615fbde19e6c0f78063206
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:53 2010 -0800
ixgbe: remove residual code left over from earlier combining of TXDCTL
Missed some code that was left floating around in the DCB configuration
for the TXDCTL register. As a result the register was being messed with in
two different spots when we only needed to do the change once.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:52 2010 -0800
ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state
The main reason for this change is to keep the suspend/resume logic matched
up. The clear_interrupt_scheme function will disable MSI-X which will
effect the PCIe configuration space. Therefore we will want to do it before
we save state to avoid having the interrupt state restored by
pci_restore_state, and then trying to re-enable MSI/MSI-X interrupts via
ixgbe_setup_interrupt_scheme.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit fc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:51 2010 -0800
ixgbe: add a netdev pointer to the ring structure
This change places a netdev pointer directly into the ring structure. This
way we can avoid having to determine which netdev we are supposed to be
using and can just access the one on the ring directly.
As a result of this change further collapse of the code is possible by
dropping the adapter from ixgbe_alloc_rx_buffers, and the netdev pointer
from ixgbe_xmit_frame_ring_adv and ixgbe_maybe_stop_tx.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 5b7da51547cc3ab5461e45a8ee0ca73051416fda
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:50 2010 -0800
ixgbe: combine some stats into a union to allow for Tx/Rx stats overlap
This change moved some of the RX and TX stats into separate structures and
them placed those structures in a union in order to help reduce the size of
the ring structure.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit b6ec895ecd32c0070c3b2b17918c030275cd834d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:49 2010 -0800
ixgbe: move device pointer into the ring structure
This change is meant to simplify DMA map/unmap by providing a device
pointer. As a result the adapter pointer can be dropped from many of
the calls.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 84ea2591e4a24775c2735511a1cc3cf88edd249d
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:49 2010 -0800
ixgbe: drop ring->head, make ring->tail a pointer instead of offset
This change drops ring->head since it is not used in any hot-path and can
easily be determined using IXGBE_[RT]DH(ring->reg_idx).
It also changes ring->tail into a true pointer so we can avoid unnecessary
pointer math to find the location of the tail.
In addition I also dropped the setting of head and tail in
ixgbe_clean_[rx|tx]_ring. The only location that should be setting the head
and tail values is ixgbe_configure_[rx|tx]_ring and that is only while the
queue is disabled.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit d5f398ed73522b9f76861af6553775c5851de0d0
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:48 2010 -0800
ixgbe: cleanup ixgbe_alloc_rx_buffers
This change re-orders alloc_rx_buffers to make better use of the packet
split enabled flag. The new setup should require less branching in the
code since now we are down to fewer if statements since we either are
handling packet split or aren't.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 8ad494b0e59950e2b4e587c32cb67a2452795ea0
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:47 2010 -0800
ixgbe: move GSO segments and byte count processing into ixgbe_tx_map
This change simplifies the work being done by the TX interrupt handler and
pushes it into the tx_map call. This allows for fewer cache misses since
the TX cleanup now accesses almost none of the skb members.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 4c0ec6544a0cd5e3eed08df2c14cf98185098abe
Author: Alexander Duyck <alexander.h.duyck(a)intel.com>
Date: Tue Nov 16 19:26:46 2010 -0800
ixgbe: remove unnecessary re-init of adapter on Rx-csum change
There is no need to reset the adapter when changing the Rx checksum
settings. Since the only change is a software flag we can disable it
without needing to reset the entire adapter.
Signed-off-by: Alexander Duyck <alexander.h.duyck(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 80ab193dce048e7b7afa43c99e69f508167e29ab
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:26:45 2010 -0800
ixgbe: DCB: credit max only needs to be gt TSO size for 82598
The maximum credits per traffic class only needs to be greater
then the TSO size for 82598 devices. The 82599 devices do not
have this requirement so only do this test for 82598 devices.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 16b61beb39f2446460f93c08d4d263dc24f22dd8
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Tue Nov 16 19:26:44 2010 -0800
ixgbe: DCB set PFC high and low water marks per data sheet specs
Currently the high and low water marks for PFC are being set
conservatively for jumbo frames. This means the RX buffers
are being underutilized in the default 1500 MTU. This patch
fixes this so that the water marks are set as described in
the data sheet considering the MTU size.
The equation used is,
RTT * 1.44 + MTU * 1.44 + MTU
Where RTT is the round trip time and MTU is the max frame size
in KB. To avoid floating point arithmetic FC_HIGH_WATER is
defined
((((RTT + MTU) * 144) + 99) / 100) + MTU
This changes how the hardware field fc.low_water and
fc.high_water are used. With this change they are no longer
storing the actual low water and high water markers but are
storing the required head room in the buffer. This simplifies
the logic and we do not need to account for the size of the
buffer when setting the thresholds.
Testing with iperf and 16 threads showed a slight uptick in
throughput over a single traffic class .1-.2Gbps and a reduction
in pause frames. Without the patch a 30 second run would show
~10-15 pause frames being transmitted with the patch ~2-5 are
seen. Test were run back to back with 82599.
Note RXPBSIZE is in KB and low and high water marks fields are
also in KB. However the FCRT* registers are 32B granularity and
right shifted 5 into the register,
(((rx_pbsize - water_mark) * 1024) / 32) << 5
is the most explicit conversion here we simplify
(rx_pbsize - water_mark) * 32 << 5 = (rx_pbsize - water_mark) << 10
This patch updates the PFC thresholds and legacy FC thresholds.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 66c87bd50ddae681ebedfda0d75e6e73ecd29ce7
Author: Greg Rose <gregory.v.rose(a)intel.com>
Date: Tue Nov 16 19:26:43 2010 -0800
ixgbevf: Update Version String and Copyright Notice
Update version string and copyright notice.
Signed-off-by: Greg Rose <gregory.v.rose(a)intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 1a51502bddca7ac1e921d918b741ffd2bec149ed
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 19:26:42 2010 -0800
ixgbe: delay rx_ring freeing
"cat /proc/net/dev" uses RCU protection only.
Its quite possible we call a driver get_stats() method while device is
dismantling and freeing its data structures.
So get_stats() methods must be very careful not accessing driver private
data without appropriate locking.
In ixgbe case, we access rx_ring pointers. These pointers are freed in
ixgbe_clear_interrupt_scheme() and set to NULL, this can trigger NULL
dereference in ixgbe_get_stats64()
A possible fix is to use RCU locking in ixgbe_get_stats64() and defer
rx_ring freeing after a grace period in ixgbe_clear_interrupt_scheme()
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Reported-by: Tantilov, Emil S <emil.s.tantilov(a)intel.com>
Tested-by: Ross Brattain <ross.b.brattain(a)intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher(a)intel.com>
commit 28d9cc7f21da6a70fc8c1516fa0ee5588572eb92
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Sat Nov 13 20:58:27 2010 +0530
ath9k_htc: Use macro for caldata array size
The calibration data variable size is based on the number of
channels available in the ath9k driver.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ef1b21f7eb074a8c8ddfea70ed70e988545c8d54
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Nov 12 08:47:07 2010 +0100
iwlwifi: kill elapsed_jiffies
Subtract of jiffies is fine even if one variable overwrap.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 70f3876f09ccf1f2819aee6caee9266b2c4b1622
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Nov 12 08:47:06 2010 +0100
iwlagn: simplify iwlagn_tx_skb
We can simplify length calculation in iwlagn_tx_skb, that function
is enough complex, without fuzz it more than necessary.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2cb7865648e44647a976875428c9dfd9d5553221
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Nov 12 08:47:05 2010 +0100
iwl3945: remove unused len_org variable
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8f0729b16ae354f9db89394fc1d2d65003455d56
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 15:07:23 2010 +0100
mac80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 885a46d0f7942d76c2f3860acb45f75237d3bb42
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 15:07:22 2010 +0100
cfg80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a619a4c0e1fd4e8c360c63d0df3fa0a401107d69
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Thu Nov 11 08:50:18 2010 +0200
mac80211: Add function to get probe request template for current AP
Chipsets with hardware based connection monitoring need to autonomically
send directed probe-request frames to the AP (in the event of beacon loss,
for example.)
For the hardware to be able to do this, it requires a template for the frame
to transmit to the AP, filled in with the BSSID and SSID of the AP, but also
the supported rate IE's.
This patch adds a function to mac80211, which allows the hardware driver to
fetch this template after association, so it can be configured to the hardware.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Acked-by: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4e8c14e9587c38f4cce8049c766935629fdb8d46
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:38 2010 +0100
ath9k_hw: add a private op for configuring radar pulse detection
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 82b873afe83c81d9b1273a816bbdacb266f71a52
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:37 2010 +0100
ath9k: clean up tx buffer setup
Merge ath_tx_send_normal and ath_tx_send_ht_normal.
Move the paprd state initialization and sequence number assignment
to reduce the number of redundant checks.
This not only simplifies buffer allocation error handling, but also
removes a small inconsistency in the buffer HT flag.
This flag should only be set if the frame is also a QoS data frame.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 61117f01e79f7c0da86c23535bed757370f5885f
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:36 2010 +0100
ath9k: remove the tx info padding byte abuse
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f0c255a07fe8a4d450cce6355a22b73ee0e9e6e0
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:35 2010 +0100
ath9k: handle tx underrun in the driver instead of rate control
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1d666d8e05edf5891a7a4bd84a25f493f01dc71a
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Nov 11 03:18:34 2010 +0100
ath9k: remove the unnecessary private xretry tx flag
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7afbb2f07028183f50ae4f7ce4dab1f32b36cf48
Author: Ben Greear <greearb(a)candelatech.com>
Date: Wed Nov 10 11:43:51 2010 -0800
ath5k: Cleanup opmode setting logic.
An earlier review suggested moving the code in a small
method that was only called once inline. This patch
accomplishes that.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Acked-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6ee63f55c7754462a45315ac93027a1df60667c9
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:16 2010 -0800
ath9k_hw: Fix low throughput issue with AR93xx
TX underruns were noticed when RTS/CTS preceded aggregates.
This issue was noticed in ar93xx family of chipsets only.
The workaround involves padding the RTS or CTS length up
to the min packet length of 256 bytes required by the
hardware by adding delimiters to the fist descriptor of
the aggregate.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 39ec2997c374b528cdbf65099b6d6b8593a67f7f
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:15 2010 -0800
ath9k: Fix bug in delimiter padding computation
There is a roundng error in delimiter padding computation
which causes severe throughput drop with some of AR9003.
signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Cc:stable@kernel.org
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bc2068020bfa976efd425f3be590f58a012fd747
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:14 2010 -0800
ath9k_hw: Add helper function for interpolation
Also round off interpolated values this would improve power
accuracy by 0.5dB in some cases.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 15cbbc44cc4abaaebc37caf0ec9410a3f83d1deb
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:13 2010 -0800
ath9k_hw: Improve power control accuracy for AR9003
It is done for 5Ghz by adding three temperature slopes.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f4475a6e52fce8d951a96c763f36b835bf89fdec
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:12 2010 -0800
ath9k_hw: Enable strong signal detection for AR9003
Attenuation from eeprom is configured into attenuator control
register.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 52a0e2477dac2106bc1688cbe9615cdafc9deb7d
Author: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Date: Wed Nov 10 05:03:11 2010 -0800
ath9k_hw: Fix XPABIAS level configuration for AR9003
Improper configuration of 0x16288 and 0x16290 would affect transmission.
Cc:stable@kernel.org
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3092354970381fb8b6439fb4def0c34632277ae9
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:10 2010 -0800
ath9k_hw: add eeprom templates for ar9003 family chipsets
We are currently using the default eeprom default and it doesn't
work properly for all ar9003 family chipsets. So add eeprom
templates for different versisons and select the eeprom table
based on the template version programmed in the eeprom.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3ceb801bffb62bc486f9662cd4dbca2cbdc6f5c7
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:09 2010 -0800
ath9k_hw: Fix paprd training frame failure.
paprd training frame fails in some rates. Fix the rate mask.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ef5a6a7573b7a12ced67dae155be8a909bc245d6
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:08 2010 -0800
ath9k_hw: Initialize 2GHz CTL properly.
The last 2GHz CTL was not being initialized, so power was being
set to 0 instead of 30dbm. Initialize to 30 like other CTLs.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b3dd6bc1f052ef3a754fa866743e4fda38522811
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Wed Nov 10 05:03:07 2010 -0800
ath9k_hw: Add new member into the eeprom structure.
Add eeprom base extension structures which are needed for
AR938x caliberation changes and gain calculation.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a9d85fbd3e5f7a0679e6276953cd23ac7bb72789
Author: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Date: Thu Nov 11 00:40:33 2010 -0800
ath9k_hw: Fix a reset failure on AR9382 (2x2).
AR9382 needs to be configured for the correct chain mask before
running AGC/TxIQ caliberation. Otherwise reset would fail.
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 72a801103f07182c0a4f3a761caa62b4ab8eb4e5
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 10 12:51:01 2010 +0900
ath5k: Add support for antenna configuration
Support setting the antenna configuration via cfg/mac80211. At the moment only
allow the simple pre-defined configurations we already have (fixed antenna A/B
or diversity), but more advanced settings are possible to implement.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 15d967532148a5fcda075282b82a271b6595a386
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 10 12:50:56 2010 +0900
mac80211: Add antenna configuration
Allow antenna configuration by calling driver's function for it.
We disallow antenna configuration if the wiphy is already running, mainly to
make life easier for 802.11n drivers which need to recalculate HT capabilites.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit afe0cbf87500f0585d217deb8c6fd329793a7957
Author: Bruno Randolf <br1(a)einfach.org>
Date: Wed Nov 10 12:50:50 2010 +0900
cfg80211: Add nl80211 antenna configuration
Allow setting of TX and RX antennas configuration via nl80211.
The antenna configuration is defined as a bitmap of allowed antennas to use.
This API can be used to mask out antennas which are not attached or should not
be used for other reasons like regulatory concerns or special setups.
Separate bitmaps are used for RX and TX to allow configuring different antennas
for receiving and transmitting. Each bitmap is 32 bit long, each bit
representing one antenna, starting with antenna 1 at the first bit. If an
antenna bit is set, this means the driver is allowed to use this antenna for RX
or TX respectively; if the bit is not set the hardware is not allowed to use
this antenna.
Using bitmaps has the benefit of allowing for a flexible configuration
interface which can support many different configurations and which can be used
for 802.11n as well as non-802.11n devices. Instead of relying on some hardware
specific assumptions, drivers can use this information to know which antennas
are actually attached to the system and derive their capabilities based on
that.
802.11n devices should enable or disable chains, based on which antennas are
present (If all antennas belonging to a particular chain are disabled, the
entire chain should be disabled). HT capabilities (like STBC, TX Beamforming,
Antenna selection) should be calculated based on the available chains after
applying the antenna masks. Should a 802.11n device have diversity antennas
attached to one of their chains, diversity can be enabled or disabled based on
the antenna information.
Non-802.11n drivers can use the antenna masks to select RX and TX antennas and
to enable or disable antenna diversity.
While covering chainmasks for 802.11n and the standard "legacy" modes "fixed
antenna 1", "fixed antenna 2" and "diversity" this API also allows more rare,
but useful configurations as follows:
1) Send on antenna 1, receive on antenna 2 (or vice versa). This can be used to
have a low gain antenna for TX in order to keep within the regulatory
constraints and a high gain antenna for RX in order to receive weaker signals
("speak softly, but listen harder"). This can be useful for building long-shot
outdoor links. Another usage of this setup is having a low-noise pre-amplifier
on antenna 1 and a power amplifier on the other antenna. This way transmit
noise is mostly kept out of the low noise receive channel.
(This would be bitmaps: tx 1 rx 2).
2) Another similar setup is: Use RX diversity on both antennas, but always send
on antenna 1. Again that would allow us to benefit from a higher gain RX
antenna, while staying within the legal limits.
(This would be: tx 0 rx 3).
3) And finally there can be special experimental setups in research and
development even with pre 802.11n hardware where more than 2 antennas are
available. It's good to keep the API simple, yet flexible.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
--
v7: Made bitmasks 32 bit wide and rebased to latest wireless-testing.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0e67d6cb753643fc076a90fa9309301b3fbfb8db
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 16:35:19 2010 -0800
drivers/net/wireless/b43legacy/main.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5b736d42bc51fe893fd7d4ceac34c727d23135e1
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 16:35:18 2010 -0800
drivers/net/wireless/b43/main.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7e559ec31c5625cf85bcb1ae0eb9f8f2a8da4a29
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 16:35:17 2010 -0800
drivers/net/wireless/ath/debug.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5cb56af29be8d12f74afcb2c1de91e51a577bd52
Author: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Date: Tue Nov 9 19:25:56 2010 +0200
rndis_wlan: workaround poor scanning with BCM4320a
BCM4320a devices seem to sometimes do scanning pretty poorly. This can be
workaround by issuing new scan every second, while not yet connected. By this
new scanning method device catches beacons much faster. Fixes bug #20822.
Reported-by: Luís Picciochi <Pitxyoki(a)gmail.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b5257c952dda24df7078c74b7b811b44c6e49206
Author: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Date: Tue Nov 9 19:25:47 2010 +0200
rndis_wlan: workaround device not returning bss for currently connected AP
BCM4320a devices do not return bss for currently connected AP in bss-list,
althought this is required by NDIS specs. Missing bss leads to warning at
net/wireless/sme.c:__cfg80211_connect_result(), WARN_ON(!bss).
Workaround this by crafting bss manually with information we can read from
device. Workaround is only used when device bss-list does not return current
bss, and so is only used with BCM4320a devices and not newer BCM4320b ones.
Fixes bug #20152.
Reported-by: Luís Picciochi <Pitxyoki(a)gmail.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna(a)mbnet.fi>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f23a478075659db8a4fd62fa6e264a8bb052cc5b
Author: Arik Nemtsov <arik(a)wizery.com>
Date: Mon Nov 8 11:51:06 2010 +0200
mac80211: support hardware TX fragmentation offload
The lower driver is notified when the fragmentation threshold changes
and upon a reconfig of the interface.
If the driver supports hardware TX fragmentation, don't fragment
packets in the stack.
Signed-off-by: Arik Nemtsov <arik(a)wizery.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ca4a0831917d6541b45f03542257fcb20dc9cf4a
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 3 23:28:45 2010 +0100
ssb: return -ENOMEM on alloc fail (instead of CRC check's result)
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 54435f9ec837cf0bb0ea02a2bb6362a6aaef5250
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 3 22:06:26 2010 +0100
ssb: workarounds: be verbose about hacking SPROM revision, don't duplicate code
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d1f9e41d1d739cd4393840d35e7554f4a439a4f1
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:53 2010 -0800
mwl8k: use const struct fw pointers throughout
This eliminates compiler warnings by doing things how the
firmware class expects.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 99020471001dbbd6edf61f105368cb6667cc683d
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:52 2010 -0800
mwl8k: make initial firmware load asynchronous
Introduce a firmware loading state machine to manage the process
of loading firmware asynchronously and completing initialization
upon success. The state machine attempts to load the preferred
firmware image. If that fails, and if an alternative firmware
image is available, it will attempt to load that one.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 952a0e963fb02e50f4afbf502f7d468a8fe2b0fa
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:51 2010 -0800
mwl8k: add API version checking for AP firmware
The AP firmware specifies an API version in the GET_HW_SPEC
command response. Currently, the driver only supports AP
firmware for the 8366, and only supports API v1. In the future,
if higher API version firmwares emerge (possibly for different
chips), different ops can be selected based on the reported API
version.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0863ade8d6bde1d151f75720d999ff27f9fe3533
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:50 2010 -0800
mwl8k: choose proper firmware image as directed by user
The mwl8k can operate in AP or STA mode, depending on the
firmware image that is loaded. By default, STA firmware is
loaded. Allow the user to override this default mode at
module load time. This saves an unnecessary firmware reload
for users only interested in AP mode.
Also, the firmware image can be swapped to meet the user's
add_interface request. For example, suppose the STA
firmware is loaded, no STA interface has been added, and the
user adds an AP interface. In this case, the AP firmware
will be loaded to meet the request.
Based on contributions from Pradeep Nemavat <pnemavat(a)marvell.com>,
Yogesh Powar <yogeshp(a)marvell.com>, and
Lennert Buytenhek <buytenh(a)wantstofly.org>.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3cc7772c0a3cc193fa9873816168bd34d4f16837
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:49 2010 -0800
mwl8k: factor out firmware loading and hw init code
This is in preparation for supporting different fw images for
different interface types, and for supporting asynchronous
firmware loading.
Based on a patch from Pradeep Nemavat <pnemavat(a)marvell.com>
and Yogesh Powar <yogeshp(a)marvell.com>
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 41fdf0974d9eb81215cb578211a6d8f8a022a9eb
Author: Nishant Sarmukadam <nishants(a)marvell.com>
Date: Fri Nov 12 17:23:48 2010 -0800
mwl8k: rf_tx_power cmd not supported by AP firmware APIv1
APIv1 AP firmware does not support the RF_TX_POWER command. It
supports the similar TX_POWER command.
Signed-off-by: Pradeep Nemavat <pnemavat(a)marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants(a)marvell.com>
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb
Author: Brian Cavagnolo <brian(a)cozybit.com>
Date: Fri Nov 12 17:23:47 2010 -0800
mwl8k: revert unnecessary modification of tx descriptor
This reverts change 783391c443728febc669e40597193308460e7b4f.
The stabilized AP v1 firmware uses the same tx descriptor as
the STA firmware.
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae63a33ec9b598b3454cf0d29077fa17b616c42a
Author: Deepak Saxena <dsaxena(a)laptop.org>
Date: Sun Oct 31 13:40:33 2010 +0000
libertas: EHS_REMOVE_WAKEUP is not always supported
Certain firmware versions, particularly the 8388 found on the XO-1,
do not support the EHS_REMOVE_WAKEUP command that is used to disable
WOL. Sending this command to the card will return a failure that
would get propagated up the stack and cause suspend to fail.
Instead, fall back to an all-zero wakeup mask.
This fixes http://dev.laptop.org/ticket/9967
Signed-off-by: Deepak Saxena <dsaxena(a)laptop.org>
Signed-off-by: Daniel Drake <dsd(a)laptop.org>
[includes fixups by Paul Fox]
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cf43298864fdfd687202db8c736473522bfceb98
Author: Daniel Drake <dsd(a)laptop.org>
Date: Sun Oct 31 13:40:12 2010 +0000
libertas: don't block usb8388 suspend if no wakeup conditions are set
This hunk added by commit 66fceb69b72f seems erroneous. We don't want to
prevent suspend of the whole system if no wakeup params are set.
In the case of the usb8388 we do want to keep the card powered up even
if there are no wakeup params. This is because it will continue acting
as a mesh node.
If the mesh is disabled, it would indeed make more sense to power down
the card during suspend, as the equivalent hunk does for the SD interface.
But that's a separate task; for now just restore the previous behaviour.
Signed-off-by: Daniel Drake <dsd(a)laptop.org>
Acked-by: Dan Williams <dcbw(a)redhat.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9d1e5e40d6cac4bf7008e04c202d71918455ca11
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 3 05:56:38 2010 +0000
mpc52xx: cleanup locking
commit 1e4e0767ecb1 (Fix locking on fec_mpc52xx driver) assumed IRQ are
enabled when an IRQ handler is called.
It is not the case anymore (IRQF_DISABLED is deprecated), so we can use
regular spin_lock(), no need for spin_lock_irqsave().
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Tested-by: Jean-Michel Hautbois <jhautbois(a)gmail.com>
Cc: Asier Llano <a.llano(a)ziv.es>
Cc: Grant Likely <grant.likely(a)secretlab.ca>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b178bb3dfc30d9555bdd2401e95af98e23e83e10
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Tue Nov 16 05:56:04 2010 +0000
net: reorder struct sock fields
Right now, fields in struct sock are not optimally ordered, because each
path (RX softirq, TX completion, RX user, TX user) has to touch fields
that are contained in many different cache lines.
The really critical thing is to shrink number of cache lines that are
used at RX softirq time : CPU handling softirqs for a device can receive
many frames per second for many sockets. If load is too big, we can drop
frames at NIC level. RPS or multiqueue cards can help, but better reduce
latency if possible.
This patch starts with UDP protocol, then additional patches will try to
reduce latencies of other ones as well.
At RX softirq time, fields of interest for UDP protocol are :
(not counting ones in inet struct for the lookup)
Read/Written:
sk_refcnt (atomic increment/decrement)
sk_rmem_alloc & sk_backlog.len (to check if there is room in queues)
sk_receive_queue
sk_backlog (if socket locked by user program)
sk_rxhash
sk_forward_alloc
sk_drops
Read only:
sk_rcvbuf (sk_rcvqueues_full())
sk_filter
sk_wq
sk_policy[0]
sk_flags
Additional notes :
- sk_backlog has one hole on 64bit arches. We can fill it to save 8
bytes.
- sk_backlog is used only if RX sofirq handler finds the socket while
locked by user.
- sk_rxhash is written only once per flow.
- sk_drops is written only if queues are full
Final layout :
[1] One section grouping all read/write fields, but placing rxhash and
sk_backlog at the end of this section.
[2] One section grouping all read fields in RX handler
(sk_filter, sk_rcv_buf, sk_wq)
[3] Section used by other paths
I'll post a patch on its own to put sk_refcnt at the end of struct
sock_common so that it shares same cache line than section [1]
New offsets on 64bit arch :
sizeof(struct sock)=0x268
offsetof(struct sock, sk_refcnt) =0x10
offsetof(struct sock, sk_lock) =0x48
offsetof(struct sock, sk_receive_queue)=0x68
offsetof(struct sock, sk_backlog)=0x80
offsetof(struct sock, sk_rmem_alloc)=0x80
offsetof(struct sock, sk_forward_alloc)=0x98
offsetof(struct sock, sk_rxhash)=0x9c
offsetof(struct sock, sk_rcvbuf)=0xa4
offsetof(struct sock, sk_drops) =0xa0
offsetof(struct sock, sk_filter)=0xa8
offsetof(struct sock, sk_wq)=0xb0
offsetof(struct sock, sk_policy)=0xd0
offsetof(struct sock, sk_flags) =0xe0
Instead of :
sizeof(struct sock)=0x270
offsetof(struct sock, sk_refcnt) =0x10
offsetof(struct sock, sk_lock) =0x50
offsetof(struct sock, sk_receive_queue)=0xc0
offsetof(struct sock, sk_backlog)=0x70
offsetof(struct sock, sk_rmem_alloc)=0xac
offsetof(struct sock, sk_forward_alloc)=0x10c
offsetof(struct sock, sk_rxhash)=0x128
offsetof(struct sock, sk_rcvbuf)=0x4c
offsetof(struct sock, sk_drops) =0x16c
offsetof(struct sock, sk_filter)=0x198
offsetof(struct sock, sk_wq)=0x88
offsetof(struct sock, sk_policy)=0x98
offsetof(struct sock, sk_flags) =0x130
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c31504dc0d1dc853dcee509d9999169a9097a717
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 19:58:26 2010 +0000
udp: use atomic_inc_not_zero_hint
UDP sockets refcount is usually 2, unless an incoming frame is going to
be queued in receive or backlog queue.
Using atomic_inc_not_zero_hint() permits to reduce latency, because
processor issues less memory transactions.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 213b15ca818adf7766cd7162c2159a6ecdd3bab8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 11 09:42:45 2010 +0000
vlan: remove ndo_select_queue() logic
Now vlan are lockless, we dont need special ndo_select_queue() logic.
dev_pick_tx() will do the multiqueue stuff on the real device transmit.
Suggested-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4af429d29b341bb1735f04c2fb960178ed5d52e7
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 10 23:42:00 2010 +0000
vlan: lockless transmit path
vlan is a stacked device, like tunnels. We should use the lockless
mechanism we are using in tunnels and loopback.
This patch completely removes locking in TX path.
tx stat counters are added into existing percpu stat structure, renamed
from vlan_rx_stats to vlan_pcpu_stats.
Note : this partially reverts commit 2e59af3dcbdf (vlan: multiqueue vlan
device)
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8ffab51b3dfc54876f145f15b351c41f3f703195
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 10 21:14:04 2010 +0000
macvlan: lockless tx path
macvlan is a stacked device, like tunnels. We should use the lockless
mechanism we are using in tunnels and loopback.
This patch completely removes locking in TX path.
tx stat counters are added into existing percpu stat structure, renamed
from rx_stats to pcpu_stats.
Note : this reverts commit 2c11455321f37 (macvlan: add multiqueue
capability)
Note : rx_errors converted to a 32bit counter, like tx_dropped, since
they dont need 64bit range.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Patrick McHardy <kaber(a)trash.net>
Cc: Ben Greear <greearb(a)candelatech.com>
Cc: Ben Hutchings <bhutchings(a)solarflare.com>
Acked-by: Patrick McHardy <kaber(a)trash.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman(a)tuxdriver.com>
Date: Tue Nov 16 10:26:47 2010 -0800
packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Version 4 of this patch.
Change notes:
1) Removed extra memset. Didn't think kcalloc added a GFP_ZERO the way kzalloc did :)
Summary:
It was shown to me recently that systems under high load were driven very deep
into swap when tcpdump was run. The reason this happened was because the
AF_PACKET protocol has a SET_RINGBUFFER socket option that allows the user space
application to specify how many entries an AF_PACKET socket will have and how
large each entry will be. It seems the default setting for tcpdump is to set
the ring buffer to 32 entries of 64 Kb each, which implies 32 order 5
allocation. Thats difficult under good circumstances, and horrid under memory
pressure.
I thought it would be good to make that a bit more usable. I was going to do a
simple conversion of the ring buffer from contigous pages to iovecs, but
unfortunately, the metadata which AF_PACKET places in these buffers can easily
span a page boundary, and given that these buffers get mapped into user space,
and the data layout doesn't easily allow for a change to padding between frames
to avoid that, a simple iovec change is just going to break user space ABI
consistency.
So I've done this, I've added a three tiered mechanism to the af_packet set_ring
socket option. It attempts to allocate memory in the following order:
1) Using __get_free_pages with GFP_NORETRY set, so as to fail quickly without
digging into swap
2) Using vmalloc
3) Using __get_free_pages with GFP_NORETRY clear, causing us to try as hard as
needed to get the memory
The effect is that we don't disturb the system as much when we're under load,
while still being able to conduct tcpdumps effectively.
Tested successfully by me.
Signed-off-by: Neil Horman <nhorman(a)tuxdriver.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Maciej Żenczykowski <zenczykowski(a)gmail.com>
Reported-by: Maciej Żenczykowski <zenczykowski(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 020f01ebd04f3429c32586d90598c9f59e54ca7d
Author: Joe Perches <joe(a)perches.com>
Date: Tue Nov 9 14:35:16 2010 +0000
drivers/isdn/mISDN: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 3654654f7aa79a37dde130afb7409c55b11807e7
Author: Jan Engelhardt <jengelh(a)medozas.de>
Date: Tue Nov 16 09:52:32 2010 -0800
netlink: let nlmsg and nla functions take pointer-to-const args
The changed functions do not modify the NL messages and/or attributes
at all. They should use const (similar to strchr), so that callers
which have a const nlmsg/nlattr around can make use of them without
casting.
While at it, constify a data array.
Signed-off-by: Jan Engelhardt <jengelh(a)medozas.de>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Mon Nov 15 20:29:21 2010 +0000
ipv6: fix missing in6_ifa_put in addrconf
Fix ref count bug introduced by
commit 2de795707294972f6c34bae9de713e502c431296
Author: Lorenzo Colitti <lorenzo(a)google.com>
Date: Wed Oct 27 18:16:49 2010 +0000
ipv6: addrconf: don't remove address state on ifdown if the address
is being kept
Fix logic so that addrconf_ifdown() decrements the inet6_ifaddr
refcnt correctly with in6_ifa_put().
Reported-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b5e4156743c5d42b736936be7a9ee8d72e0e4ac9
Merge: 6b35308 b1d771e
Author: David S. Miller <davem(a)davemloft.net>
Date: Tue Nov 16 09:17:12 2010 -0800
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 9e2e7422d059f9b98c3a0810df92a1ff660ade2f
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Fri Nov 12 13:52:37 2010 -0800
iwlwifi: set STATUS_READY before commit_rxon
Have the STATUS_READY bit set before commit_rxon call to avoid fail
to send tx power to uCode.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 6163a3735aad19bdb8d02b3362d3a2d7d2eb78d5
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Fri Nov 12 13:48:13 2010 -0800
iwlagn: check change before commit RXON cmd
When setting rxon chain and filter, no need to commit RXON when the
chain flag is not changed. This reduces the number of RXON commands
we send down to uCode.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 21a5b3c6b19a8b8972ccdd55389be28a8b7c9180
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 13:32:59 2010 -0800
iwlagn: use SKU information in the EEPROM
EEPROM contain the SKU information for the device, use it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit f4115d46599464a49a3055d33d499d97ac81fccb
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Wed Nov 10 18:25:58 2010 -0800
iwlagn: update QoS before commit associated RXON
RXON command without association bit can clear the QoS info in the
uCode. Therefore, before sending the associated RXON, we need to
send the QoS command just in case.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit efe54db8233a4b41e68cbe67ca2e30c48532078a
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:49 2010 -0800
iwlagn: fix PAN slot timing wrt. DTIM
When the DTIM is not 1, then the slot timing is in
some cases required to be calclulated based on the
DTIM interval instead of the beacon interval, fix
that.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 2b5f7a679c2ae34407f6cc9387e77b563578bfdc
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:48 2010 -0800
iwlagn: reprogram AP STA after assoc
Instead of unconditionally sending unassoc RXON,
before any assoc RXON, re-send only the AP STA
entry which is required after the BSSID has been
programmed into the device to set up internal
filters in the microcode properly.
This fixes some issues that we correlated with
sending a lot of RXON commands to the device.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 893654de3ff41a4f5037397d06a3f853bbbb3484
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:47 2010 -0800
iwlagn: avoid crash if vif is not assigned
For reasons that aren't entirely clear to me,
we sometimes get here during hardware reset
without the interface being set. Don't crash,
but keep a warning.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit cfa1da7e9133be9280990b2a64fa7696924c8d9a
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:46 2010 -0800
iwlagn: fix PAN queues
Currently, when a PAN queue needs to be
stopped, we erroneously stop queue number 5
(for example) with mac80211 -- which doesn't
even exist!
To avoid that problem, recalculate the swq_id
for all queues when setting up the queues,
and don't use the default identity mapping
that is acceptable for devices which don't
support PAN.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit ea9b307f8e859186a6791e0d508c5993448ac900
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:45 2010 -0800
iwlwifi: always build swq_id as virtual queue ID
Previously, we used the swq_id's mechanism
to have AC and HW queue different only for
aggregation queues. To be able to fix a bug
with iPAN simply always build the swq_id as
ac | (hwq << 2) and remove the flag bit.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 549a04e092e5e043df82fd0541f3b67ab488359b
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:44 2010 -0800
iwlwifi: pass txq to wake/stop queue
Instead of passing the txq->swq_id, pass the
txq struct directly to make sure that in the
future nobody will pass an invalid number.
Only three places actually change from using
the txq_id or the skb's queue_mapping to now
using txq->swq_id as well.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 4bea9b990205e4a3d432d9d6c29687215618a306
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:43 2010 -0800
iwlagn: remove a bogus AGG_OFF check
Even if this check were to happen, using the
txq_id here (which is a HW queue) would lead
to confusion in mac80211. Luckily, it doesn't
seem like this can ever happen.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 8d56396ac3926412dd97dcb9dd8d0cef556b908e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:42 2010 -0800
iwlagn: remove unused variable swq_id
Simply remove the unused variable swq_id.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 18:25:41 2010 -0800
iwlagn: fix some naming regarding FIFOs
Some variables are misnamed in the FIFO setup
code, fix that.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 564b344c10b694d433cef5b89f8ff8ac5e33898d
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Tue Nov 9 09:21:34 2010 -0800
iwlwifi: change default led mode for different devices
Set the default led mode for different devices.
For the newer devices such as 6000g2a, 6000g2b and newer,
the default led mode is On/Off instead of blinking.
The led_mode still can be control through module parameter
0: system default
1: On/Off
2: blinking
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 05433df23cf16a9ccbdd35964aba781cdf455034
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 8 12:37:20 2010 -0800
iwlagn: change default ACK/CTS MASK setting for WiFi/BT coex
Change the default BT_KILL_ACK_MASK and BT_KILL_CTS_MASK for BT coex
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 66e863a527f9ed3a871797862aaf0d62b0954813
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 8 14:54:37 2010 -0800
iwlagn: support dynamic aggregation for BT coex
Use dynamic aggregation threshold if bt traffic load is high
to reduce the impact on aggregated frame.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 95a5ede3ee9269e175bfe0e6f5a4a5fd2914ed6a
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Mon Nov 8 14:55:43 2010 -0800
iwlagn: set dynamic aggregation threshold for BT
Setting the max/min/def value for BT dynamic aggregation threshold.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 8829c9e2ec144baeb3cee599e1e653a396ad521b
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 11:05:38 2010 -0800
iwlagn: used frame count info in compressed ba packet
For newer devices, uCode provide both "number of frames sent"
and "number of frames acked" information inside the compressed_ba
packet. So instead of figure the success/failure information through
the bitmap, use those information which is much betrer approach.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit 6b35308850e1679741e8b646cfb7bb3ab5369888
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 20:15:03 2010 -0800
net: Export netif_get_vlan_features().
ERROR: "netif_get_vlan_features" [drivers/net/xen-netfront.ko] undefined!
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1f4f067f99cbb2af7af7a67bd025a9fb58b5156c
Author: Vasanthy Kolluri <vkolluri(a)cisco.com>
Date: Mon Nov 15 08:09:55 2010 +0000
enic: Fix build warnings
Fix data type of argument passed to pci_alloc_consistent and pci_free_consistent routines.
Signed-off-by: Vasanthy Kolluri <vkolluri(a)cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com>
Signed-off-by: David Wang <dwang2(a)cisco.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ce5a121304af02d02489e86efb6ae26a67f95e52
Author: Alan Cox <alan(a)linux.intel.com>
Date: Mon Nov 15 07:30:42 2010 +0000
hso: Fix unused variable warning
Fallout from the TIOCGICOUNT work
Signed-off-by: Alan Cox <alan(a)linux.intel.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ec1e5610c00c7f5bc530d2aadd47faa473b90a30
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 06:38:14 2010 +0000
bridge: add RCU annotations to bridge port lookup
br_port_get() renamed to br_port_get_rtnl() to make clear RTNL is held.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b5ed54e94d324f17c97852296d61a143f01b227a
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 15 06:38:13 2010 +0000
bridge: fix RCU races with bridge port
The macro br_port_exists() is not enough protection when only
RCU is being used. There is a tiny race where other CPU has cleared port
handler hook, but is bridge port flag might still be set.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 61391cde9eefac5cfcf6d214aa80c77e58b1626b
Author: stephen hemminger <shemminger(a)vyatta.com>
Date: Mon Nov 15 06:38:12 2010 +0000
netdev: add rcu annotations to receive handler hook
Suggested by Eric's bridge RCU changes.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit a386f99025f13b32502fe5dedf223c20d7283826
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 06:38:11 2010 +0000
bridge: add proper RCU annotation to should_route_hook
Add br_should_route_hook_t typedef, this is the only way we can
get a clean RCU implementation for function pointer.
Move route_hook to location where it is used.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e80516880019aa1f7c5c410276edfea9575ec89f
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Mon Nov 15 06:38:10 2010 +0000
bridge: add RCU annotation to bridge multicast table
Add modern __rcu annotatations to bridge multicast table.
Use newer hlist macros to avoid direct access to hlist internals.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8a22c99a80b0926585cfcbcc423ee2c49c1fd820
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:05:00 2010 +0000
net/ipv6/mcast.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:58 2010 +0000
include/net/caif/cfctrl.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Acked-by: Sjur Braendeland <sjur.brandeland(a)stericsson.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c59504ebc5baa628706d10c2d3c7e1f4bc3c2147
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:57 2010 +0000
include/linux/if_macvlan.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 779bb41d4bd111d5631d58d1bf2d00b5c4389c80
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:37 2010 +0000
drivers/net/cnic.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e81a1ba815666ec02ef5bf0e17cf256c88d233b3
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:33 2010 +0000
drivers/net/ixgbe: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d51c4185bb369cb39ed8cc20b331508e47b35b2
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:32 2010 +0000
drivers/net/e1000e: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6f38ad93e4882e84c1cc113736db7dc9252dcf11
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:31 2010 +0000
drivers/net/bnx2x: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ad65ffd12dccf6d1031298eacc060327751084da
Author: Joe Perches <joe(a)perches.com>
Date: Sun Nov 14 17:04:26 2010 +0000
drivers/isdn: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 6c1b6c6b873d66d353ef47a054156dfde3f4c075
Merge: fe82224 7e87fe8
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 10:59:49 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit fe8222406c8277a21172479d3a8283d31c209028
Author: Tom Herbert <therbert(a)google.com>
Date: Tue Nov 9 10:47:38 2010 +0000
net: Simplify RX queue allocation
This patch move RX queue allocation to alloc_netdev_mq and freeing of
the queues to free_netdev (symmetric to TX queue allocation). Each
kobject RX queue takes a reference to the queue's device so that the
device can't be freed before all the kobjects have been released-- this
obviates the need for reference counts specific to RX queues.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ed9af2e839c06c18f721da2c768fbb444c4a10e5
Author: Tom Herbert <therbert(a)google.com>
Date: Tue Nov 9 10:47:30 2010 +0000
net: Move TX queue allocation to alloc_netdev_mq
TX queues are now allocated in alloc_netdev_mq and freed in
free_netdev.
Signed-off-by: Tom Herbert <therbert(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit cc9ff19da9bf76a2f70bcb80225a1c587c162e52
Author: Timo Teräs <timo.teras(a)iki.fi>
Date: Wed Nov 3 04:41:38 2010 +0000
xfrm: use gre key as flow upper protocol info
The GRE Key field is intended to be used for identifying an individual
traffic flow within a tunnel. It is useful to be able to have XFRM
policy selector matches to have different policies for different
GRE tunnels.
Signed-off-by: Timo Teräs <timo.teras(a)iki.fi>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1f2d8c2cc61d2b9472efe44e8a2b098336914b4
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 10:37:30 2010 -0800
vlan: Fix build warning in vlandev_seq_show()
net/8021q/vlanproc.c: In function 'vlandev_seq_show':
net/8021q/vlanproc.c:283:20: warning: unused variable 'fmt'
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b1d771ee33c6e4006676002b9d74abf45b71d3d6
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:11:23 2010 +0200
carl9170: use generic sign_extend32
This patch replaces the handcrafted
sign extension cruft with a generic
bitop function.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7919a57bc608140aa8614c19eac40c6916fb61d2
Author: Andreas Herrmann <andreas.herrmann3(a)amd.com>
Date: Mon Aug 30 19:04:01 2010 +0000
bitops: Provide generic sign_extend32 function
This patch moves code out from wireless drivers where two different
functions are defined in three code locations for the same purpose and
provides a common function to sign extend a 32-bit value.
Signed-off-by: Andreas Herrmann <andreas.herrmann3(a)amd.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e4b3fdb80021bc0a3239bfc2a873a6d7c6ac52a1
Author: Grazvydas Ignotas <notasas(a)gmail.com>
Date: Thu Nov 4 00:13:49 2010 +0200
wl1251: use wl12xx_platform_data to pass data
Make use the newly added method to pass platform data for wl1251 too.
This allows to eliminate some redundant code.
Cc: Ohad Ben-Cohen <ohad(a)wizery.com>
Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com>
Acked-by: Kalle Valo <kvalo(a)adurom.com>
Acked-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Acked-by: Tony Lindgren <tony(a)atomide.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 1d4b89f2970f9ea0902d0a3bc1090f3c770b5080
Author: Grazvydas Ignotas <notasas(a)gmail.com>
Date: Mon Nov 8 15:29:36 2010 +0200
wl1251: add runtime PM support for SDIO
Add runtime PM support, similar to how it's done for wl1271.
This allows to power down the card when the driver is loaded but
network is not in use.
Cc: Ohad Ben-Cohen <ohad(a)wizery.com>
Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com>
Acked-by: Kalle Valo <kvalo(a)adurom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cb7bbc7a5535ab2333915b83391e1d846a0914df
Author: Grazvydas Ignotas <notasas(a)gmail.com>
Date: Thu Nov 4 00:13:47 2010 +0200
wl1251: add power callback to wl1251_if_operations
Call interface specific power callback before calling board specific
one. Also allow that callback to fail. This is how it's done for
wl1271 and will be used for runtime_pm support.
Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com>
Acked-by: Kalle Valo <kvalo(a)adurom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f81c1f48384d398dbe8f6c5b10377c7158086791
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:50 2010 -0800
iwlagn: enable shadow register
For 6000 series devices and up, enable automatic update MAC's register
for better power usage in PSP mode
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6fe8efb2211fe61caa7b0e1c36c521670b8a10a9
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Wed Nov 10 09:56:49 2010 -0800
iwlwifi: disable disconnected antenna for advanced bt coex
Disconnected antenna algorithm is used to find out which antennas are
disconnected. It should be disabled for devices that support advanced
bluetooth coexist.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3031242b31dcd76e1c6b1c1718cfee872f55d5af
Author: Shanyu Zhao <shanyu.zhao(a)intel.com>
Date: Wed Nov 10 09:56:48 2010 -0800
iwlwifi: seperate disconnected antenna function
Disconnected antenna algorithm is seperated into its own function from chain noise
calibration routine for better code management.
Signed-off-by: Shanyu Zhao <shanyu.zhao(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b2769b84d86a2d29fa131a763d2b23b112834420
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:47 2010 -0800
iwlagn: fix RXON HT
When the HT information is changed due to
BSS changes (like legacy stations joining)
we need to recalculate HT RXON parameters.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8da8e62851680772f0422d0f1c4b467190b268e5
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:46 2010 -0800
iwlagn: re-enable calibration
During the RXON rewrite, this code got lost.
When we've just associated, we need to enable
all calibrations and see if some were already
finished. Add back the missing code.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 52d980c01353202332ff4322f3f41db0c49816a5
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:45 2010 -0800
iwlagn: fix RXON issues
The RXON rework resulted in a massive loss of
throughput because we weren't programming the
device completely correctly -- the BSSID has
to be programmed into the device before the
AP station is uploaded. To fix this, simply
always send the unassoc RXON, i.e. even when
it was already unassoc so that the BSSID and
some other parameters are updated properly.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2e1fea43aa170e18beb8378465e595e18cd08f6e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:44 2010 -0800
iwlagn: fix needed chains calculation
Garen noticed that this was wrong. Fix
the calibration -- default to multiple
chains and fall back to single where
possible.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 35a6eb36520b938742d8680fd8d821df20982ced
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:43 2010 -0800
iwlwifi: resending QoS command when HT changes
"mac80211: Fix WMM driver queue configuration"
inadvertedly broke iwlwifi, because now mac80211
configures the QoS settings before assoc, and
therefore before HT. Thus, iwlwifi no longer told
the device about the HT setting, which it needs
to -- and thus throughput went down a lot. Fix
this by resending the QoS command to the device
not only when QoS/WMM settings change, but also
when HT changes.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fd11743dd25efe7157ff17b03dd2db0cbb6fed05
Author: Winkler, Tomas <tomas.winkler(a)intel.com>
Date: Wed Nov 10 09:56:42 2010 -0800
iwlwlifi: update rx write pointer w/o request mac access in the CAM mode
In iwl_rx_queue_update_write_ptr function
replace iwl_write_direct32 with iwl_write32 when not in power save mode.
We don't have to go through grab nic access as the NIC is already awake.
Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 708068db4c09f93937a6a83ac8fff8516f482b0f
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:41 2010 -0800
iwlwifi: legacy tx_cmd_protection function
Legacy (4965 and 3945) devices has different tx_cmd_protection routine.
Move to iwl-legacy.c
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e39fdee1d7856817619326fa114438c146d74510
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:40 2010 -0800
iwlwifi: put all the isr related function under ops
There were two type of isr supported by iwlwifi devices.
legacy isr - only used by legacy devices (3945 & 4965)
ict isr - used by all new generation of iwlwifi devices
Move all the isr related functions into ops, the ict type of isr
supports only needed for newer devices.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 81baf6ec9c190ae128748cf2a026bff5cb811b70
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:39 2010 -0800
iwlwifi: Legacy isr only used by legacy devices
Move iwl_isr_legacy function to iwl_legacy.c since it only used
by legacy devices.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ae79d23d0b2c16998e60f49a16dae53521c76a45
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Wed Nov 10 09:56:38 2010 -0800
iwlagn: fix non-5000+ build
When building 4965 without 5000+ there were a
lot of build errors due to functions being used
that weren't even compiled in. To fix this move
some code around and only compile the HCMD code
for 5000+ series as it's not used for 4965.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2a21ff446c07b95d08cbb830bd20112f3ee1d76e
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:37 2010 -0800
iwlagn: update PCI ID for 100 series devices
Update the supported PCI ID list for 100 series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fb30eaf38703d7562606e49a5872745d66366a50
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:36 2010 -0800
iwlagn: update PCI ID for 6000g2a series devices
Update the supported PCI ID list for 6000g2a series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8b37d9f0a1e114a1c7f5082842fb310a81ea3732
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Wed Nov 10 09:56:35 2010 -0800
iwlagn: update PCI ID for 6000g2b series devices
Update the supported PCI ID list for 6000g2b series devices
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5d882c97e2c958df9f8b78832fa1ecbecef6ea1d
Author: Ben Greear <greearb(a)candelatech.com>
Date: Mon Nov 8 10:50:03 2010 -0800
ath5k: Print stats as unsigned ints.
The debugfs code for ath5k was printing some unsigned int
stats with %d instead of %u. This meant that you could see
negative numbers instead of a clean wrap.
Signed-off-by: Ben Greear <greearb(a)candelatech.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8c5765fda4b382acce4ff386e18ec11790dff893
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:49:01 2010 +0100
rt2x00: Add watchdog functions for HW queue
Add watchdog functions for managing the Queues inside the hardware.
Normally the driver doesn't have much to do with these queues
directly, but the Ralink drivers did implement watchdog functions
for these. These watchdog functions are not triggered that often,
compared to the other watchdog functions, but I have at least
seen them trigger once or twice during a long stresstest run.
v2: Add extra documentation for register fields
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ea175ee26268370ca07aff91cf6ba1e0f1a3bd36
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:48:43 2010 +0100
rt2x00: Remove rt2x00lib_toggle_rx
As part of the queue refactoring, the rt2x00lib_toggle_rx
can be removed and replaced with the call directly to
the set_device_state callback function.
We can remove the STATE_RADIO_RX_ON_LINK and
STATE_RADIO_RX_OFF_LINK, as it was only used for
special behavior inside rt2x00lib rather then the
drivers.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8be4eed0ea7d8ef38692de878043a949e9db16e8
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:48:23 2010 +0100
rt2x00: Fix rt2x00queue_kick_tx_queue arguments
The queue_entry argument to rt2x00queue_kick_tx_queue,
doesn't make sense due to the function name (it is called
kick QUEUE)... But neither do we need the queue_entry, since
we need the data_queue.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 813f0339dd739c48607f12dac79ec26c61874226
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Sat Nov 6 15:48:05 2010 +0100
rt2x00: Rename queue->lock to queue->index_lock
The queue->lock is only used to protect the index
numbers. Rename the lock accordingly.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 821cde63b5bd04bc3ca0f95e2abf17b04e640488
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:47:46 2010 +0100
rt2x00: checkpatch.pl error fixes for rt73usb.c
rt73usb.c:43: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8bfbc31794635f6d0b7fd30950d49cecf54e1ce
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:47:25 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00queue.c
rt2x00queue.c:804: ERROR: space prohibited after that open parenthesis '('
rt2x00queue.c:805: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 027e8fd105c82956de9dec232bad21b1628ee7c0
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:47:09 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00link.c
rt2x00link.c:70: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5f181dc16bbd13b68b54ed5c43c4d2c5ad00297b
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:46:53 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00lib.h
rt2x00lib.h:60: ERROR: space prohibited after that open parenthesis '('
rt2x00lib.h:60: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c2361baec100c6f373107346e3fd98e9b267ac6c
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:46:36 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00dev.c
rt2x00dev.c:689: ERROR: spaces required around that '=' (ctx:WxV)
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8a239033c355be998b8985f12f0cc3a9eaeb93e9
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:46:17 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2x00config.c
rt2x00config.c:136: ERROR: space required before the open parenthesis '('
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 87a46caf920515eb269df0109f0a61a958236568
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:58 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800usb.h
rt2800usb.h:43: ERROR: space prohibited after that open parenthesis '('
rt2800usb.h:43: ERROR: space prohibited before that close parenthesis ')'
rt2800usb.h:44: ERROR: space prohibited after that open parenthesis '('
rt2800usb.h:44: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 144b80bc05e76df0acb8b5e86a6e6aaf0c53325e
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:41 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800usb.c
rt2800usb.c:48: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c6cbadeb3afd9471e539791842877d085f367746
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:22 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800pci.h
rt2800pci.h:41: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:42: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:43: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:44: ERROR: Macros with complex values should be enclosed in parenthesis
rt2800pci.h:55: ERROR: space prohibited after that open parenthesis '('
rt2800pci.h:55: ERROR: space prohibited before that close parenthesis ')'
rt2800pci.h:56: ERROR: space prohibited after that open parenthesis '('
rt2800pci.h:56: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bf1b15125e2aa245ddd9348f80d041d4f1fd13a9
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:45:06 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800lib.c
rt2800lib.c:831: ERROR: inline keyword should sit between storage class and type
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fd8dab9a67b22c35f38f0f5bfff4b3f6ed02e43a
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:52 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2800.h
rt2800.h:1511: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1511: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1513: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1513: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1515: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1515: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1517: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1517: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1519: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1519: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1521: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1521: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1661: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1661: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1662: ERROR: space prohibited after that open parenthesis '('
rt2800.h:1662: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:1663: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:2013: ERROR: space prohibited after that open parenthesis '('
rt2800.h:2013: ERROR: space prohibited before that close parenthesis ')'
rt2800.h:2014: ERROR: space prohibited after that open parenthesis '('
rt2800.h:2014: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cf553477a4dfb819c66ebfcad9f3b5cc3b93a9af
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:33 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2500usb.c
rt2500usb.c:42: ERROR: do not initialise statics to 0 or NULL
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit cb771b1a5de81e3ee59bd8b7ed17da6d09ffcf68
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:15 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2500pci.h
rt2500pci.h:1091: ERROR: space prohibited after that open parenthesis '('
rt2500pci.h:1091: ERROR: space prohibited before that close parenthesis ')'
rt2500pci.h:1092: ERROR: space prohibited after that open parenthesis '('
rt2500pci.h:1092: ERROR: space prohibited before that close parenthesis ')'
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 46b9786975a69a75f25b71796f7e36d203fbd4ee
Author: Mark Einon <mark.einon(a)gmail.com>
Date: Sat Nov 6 15:44:00 2010 +0100
rt2x00: checkpatch.pl error fixes for rt2400pci.h
rt2400pci.h:812: ERROR: space prohibited after that open parenthesis '('
rt2400pci.h:812: ERROR: space prohibited before that close parenthesis ')'
rt2400pci.h:813: ERROR: space prohibited after that open parenthesis '('
rt2400pci.h:813: ERROR: space prohibited before that close parenthesis ')'
rt2400pci.h:950: ERROR: Macros with complex values should be enclosed in parenthesis
Signed-off-by: Mark Einon <mark.einon(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 041fb8f504fb0a6b61bc2131679da554b2fa8c9d
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Sat Nov 6 14:07:10 2010 +0100
carl9170: tx path review
This patch fixes a few shortcomings in the tx path.
* move temp. ampdu_[ack]_len out of txinfo->pad.
* fix WARN_ON from tx.c:line 300 when tx_ampdu_queue
fails to queue the frame.
* In tx_prepare, we already have a local pointer
to the station's ieee80211_sta struct.
* remove a second !sta check, tx_prepare already takes
care of that.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ffa56e540c3949c4560dcce45eca247819e183c1
Author: Jesper Juhl <jj(a)chaosbits.net>
Date: Thu Nov 4 22:59:56 2010 +0100
mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher()
crypto_free_cipher() is a wrapper around crypto_free_tfm() which is a
wrapper around crypto_destroy_tfm() and the latter can handle being passed
a NULL pointer, so checking for NULL in the
ieee80211_aes_key_free()/ieee80211_aes_cmac_key_free() wrappers around
crypto_free_cipher() is pointless and just increase object code size
needlesly and makes us execute extra test/branch instructions that we
don't need.
Btw; don't we have to many wrappers around wrappers ad nauseam here?
Anyway, this patch removes the redundant conditionals.
Signed-off-by: Jesper Juhl <jj(a)chaosbits.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 723fc7af5300dba9eac40cb23dbefa67589e5181
Author: Lalith Suresh <suresh.lalith(a)gmail.com>
Date: Thu Nov 4 20:43:16 2010 +0100
rt2x00: Fix comments in rt73usb.h and rt61pci.h
This patch fixes a few comments in rt73usb.h and rt61pci.h.
Signed-off-by: Lalith Suresh <suresh.lalith(a)gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fa8b4b22d543b4052602b0c86065150613ed19e8
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:42:36 2010 +0100
rt2x00: Fix hw crypto in AP mode for some devices
The BSSID register shouldn't be set in AP mode on some older devices (like
rt73usb) as it breaks hw crypto on these. However, rt2800 devices explicitly
need the BSSID register set to the same value as our own MAC address (only
in AP mode).
Hence, don't set the BSSID from rt2x00lib but move it down into rt2800 to
avoid problems on older devices.
This fixes a regression (at least for rt73usb) and avoids a new regression
for rt2800 devices in 2.6.36.
Reported-by: Johannes Stezenbach <js(a)sig21.net>
Reported-by: Lee <lee-in-berlin(a)web.de>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 070192dd2975c0e97bbdeac7623b755235c6db7d
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:41:05 2010 +0100
rt2x00: Fix crash on USB unplug
By not scheduling the TX/RX completion worker threads
when Radio is disabled, or hardware has been unplugged,
the queues cannot be completely cleaned.
This causes crashes when the hardware has been unplugged while
the radio is still enabled.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 303c7d6abfd0430e39e84a43361492b4a8c890b6
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:40:46 2010 +0100
rt2x00: Fix MCU_SLEEP arguments
Legacy driver uses 0xff as the second argument for the MCU_SLEEP
command. It is still unknown what the values actually mean, but
this will at least keep the command in-sync with the original
driver.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f44df18c58d4debe3ec0bb76a490aa2f3929fd8b
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:40:11 2010 +0100
rt2x00: Implement flush callback
Implement a basic flush callback function, which simply loops
over all TX queues and waits until all frames have been transmitted
and the status reports have been gathered.
At this moment we don't support dropping any frames during the
flush, but mac80211 will only send 'false' for this argument anyway,
so this is not important at this time.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit aaf886bd215396f295bc0489e8ae09d1c03d9aa0
Author: Ivo van Doorn <IvDoorn(a)gmail.com>
Date: Thu Nov 4 20:39:48 2010 +0100
rt2x00: Remove failsave from rt2x00usb_watchdog_tx_dma
When the TX status handler failed to clear the queue
in rt2x00usb_watchdog_tx_dma() we shouldn't use a failsave
to use the rt2x00usb txdone handler.
If a driver has overriden the txdone handler it must make
sure the txdone handler is capable of cleaning up the queue itself.
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7225ce1ea93d24c0914eea0410dcfc426281f996
Author: Ivo van Doorn <ivdoorn(a)gmail.com>
Date: Thu Nov 4 20:39:23 2010 +0100
rt2x00: Rename rt2x00queue_timeout
Rename rt2x00queue_timeout to rt2x00queue_status_timeout to
better describe what is actually timing out (note that
we already have a rt2x00queue_dma_timeout).
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Acked-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e2f8c8752b994026fc0ddb4bb29ca229b3e0c104
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:38:56 2010 +0100
rt2x00: Optimize rt2x00debug_dump_frame when frame dumping is not active
When rt2x00 is compiled with debugging but frame dumping is currently
not active we can avoid the call to do_gettimeofday. Furthermore,
frame dumping is not the default case, mark it as unlikely.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2b23cdaa3b0e9567597563e5a7a5103ecda447f0
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:38:15 2010 +0100
rt2x00: Reduce tx descriptor size
The tx descriptor values qid, cw_min, cw_max and aifs are directly
accessible through the tx entry struct. So there's no need to copy
them into the tx descriptor and passing them to the indiviual drivers.
Instead we can just get the correct value from the tx entry.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 08e5310028359de2daaa39cd10e9ca493c51792b
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:37:47 2010 +0100
rt2x00: Wait up to one second on rt2800 for WPDMA to be ready
At least some devices need such a long time to inititalize WPDMA. This
only increases the maximum wait time and shouldn't affect devices that
have been working before.
Reported-by: Joshua Smith <jesmith(a)kaon.com>
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit efd2f271e44c7ea011cdb0363d38f40338ab80d2
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:37:22 2010 +0100
rt2x00: Sync Tx and RX ring sizes with legacy drivers
All rt2x00 devices used the same Tx and Rx ring size (24 entries) till
now. Newer devices (like rt2800) can however make use of a larger TX and
RX ring due to 11n capabilities (AMPDUs of size 64 for example).
Hence, bring rt2x00 in sync with the legacy drivers and use the same TX
and RX ring sizes. Also remove the global defines RX_ENTRIES, TX_ENTRIES,
BEACON_ENTRIES and ATIM_ENTRIES and use per driver values.
That is 24 entries for rt2400pci, 32 entries for rt2500pci, rt2500usb,
rt61pci and rt73usb and 128 (RX) and 64 (TX) for rt2800pci and rt2800usb.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 961621abee08fde2328daf6f8000e1059e5205e9
Author: Helmut Schaa <helmut.schaa(a)googlemail.com>
Date: Thu Nov 4 20:36:59 2010 +0100
rt2x00: Add TXOP_CTRL_CFG register definition
Remove the magic value initialisation of the TXOP_CTRL_CFG register by
defining its fields and using them during intialisation. The field
RESERVED_TRUN_EN is referred to as reserved, however it is set to 1 by
the legacy drivers. Hence, do the same.
Signed-off-by: Helmut Schaa <helmut.schaa(a)googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 066dae93bdfcc7af5e38a33617773fd5c6457607
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sun Nov 7 14:59:39 2010 +0100
ath9k: rework tx queue selection and fix queue stopping/waking
The current ath9k tx queue handling code showed a few issues that could
lead to locking issues, tx stalls due to stopped queues, and maybe even
DMA issues.
The main source of these issues is that in some places the queue is
selected via skb queue mapping in places where this mapping may no
longer be valid. One such place is when data frames are transmitted via
the CAB queue (for powersave buffered frames). This is made even worse
by a lookup WMM AC values from the assigned tx queue (which is
undefined for the CAB queue).
This messed up the pending frame counting, which in turn caused issues
with queues getting stopped, but not woken again.
To fix these issues, this patch removes an unnecessary abstraction
separating a driver internal queue number from the skb queue number
(not to be confused with the hardware queue number).
It seems that this abstraction may have been necessary because of tx
queue preinitialization from the initvals. This patch avoids breakage
here by pushing the software <-> hardware queue mapping to the function
that assigns the tx queues and redefining the WMM AC definitions to
match the numbers used by mac80211 (also affects ath9k_htc).
To ensure consistency wrt. pending frame count tracking, these counters
are moved to the ath_txq struct, updated with the txq lock held, but
only where the tx queue selected by the skb queue map actually matches
the tx queue used by the driver for the frame.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Reported-by: Björn Smedman <bjorn.smedman(a)venatech.se>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 21e731a1b15bf03927e292af1b4a2c84fc8af817
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Wed Nov 3 21:36:12 2010 +0100
b43legacy: rfkill: use status register based on core revision (not PHY's)
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d94519c1b0de827d5d142b9333b7f114c0b3a021
Author: maximilian attems <max(a)stro.at>
Date: Tue Nov 2 23:39:12 2010 +0100
zd1201: Add missing id
The Mandriva patch seems to stem from 2.6.14, so much for their
upstreaming effort.
Didn't find another Linux reference of it, just an omnious
"USB\VID_1044&PID_8004" from GigabyteZD1201U.INF for
Gigabyte GN-WLBZ101 802.11b USB Adapter, which matches the
Mandriva patch comment.
Aboves file also lists an "USB\VID_1044&PID_8006", which I have
kept appart as this "Gigabyte GN-WBZB-M 802.11b USB Adapter"
didn't show up in googling.
Signed-off-by: maximilian attems <max(a)stro.at>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8cecc90e4a302ac214c48e362709ce906a96a295
Author: maximilian attems <max(a)stro.at>
Date: Tue Nov 2 23:10:12 2010 +0100
zd1211rw: add 2 missing usb id's
"These USB ID came from Palnex <http://www.planex.co.jp/>
Worked fine." says Mandriva patch for their 2.6.32 and earlier.
Web has evidence for both id's to work, so just add them upstream:
http://www.mail-archive.com/zd1211-devs@lists.sourceforge.net/msg00507.html
http://ubuntuforums.org/showthread.php?t=473046
Signed-off-by: Go Taniguchi <go(a)turbolinux.co.jp>
Signed-off-by: maximilian attems <max(a)stro.at>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit daeeb074105a80a34f90a454c24efc14e9a8d3c3
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:39 2010 -0200
rtl8187: restore anaparam registers after reset with 8187B
Current 8187B initialization misses anaparam registers restore after
8187 reset. This causes ANAPARAM register to stay zeroed out (ANAPARAM2
kept its value on my tests). To avoid this, call rtl8187_set_anaparam
right after chip reset (to be on the safe side, as it makes sure we
restore all ANAPARAM registers).
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Cc: seno <senada(a)t-online.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 998606cfd75e7a8169ed0d324061a8d6bc60716a
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:38 2010 -0200
rtl8187: remove uneeded setting of anaparam write
Usually you set RTL818X_CONFIG3_ANAPARAM_WRITE when you are going to
change/write ANAPARAM registers. But in current initialization of
RTL8187B there is a place where ANAPARAM_WRITE bit is set without any
ANAPARAM register being written, without reason, so remove it.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Cc: seno <senada(a)t-online.de>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 0bf198eb4d05a4662143e4a2e2a44fb592e2b177
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:37 2010 -0200
rtl8187: consolidate anaparam on/off write sequences
There are repeated calls for anaparam on/off sequence in the code.
Consolidate the common code in rtl8187_set_anaparam and use it where
needed.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit fe3326903d7aafd7b5602d8e178537c8b0465f6c
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:36 2010 -0200
rtl8187: don't set RTL818X_CONFIG3_GNT_SELECT flag on 8187B
The GNTSel bit should only concern pci devices by looking at RTL8180
spec, which is not the case of 8187B. Also testing shows that trying to
set this bit fails, a subsequent read from the register after trying to
set it shows that the bit isn't set, seems the hardware ignores it,
which makes sense. This setting was a left over from Realtek sources.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 896cae65fc0489b8e42bb7790f64731d53a2cecf
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:35 2010 -0200
rtl8187: move pll reset at start out of ANAPARAM write
On 8187B start, comment about pll reset, and move it out of ANAPARAM
write sequence, so that code is more readable.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a8ff34e37a186ebb7d2d90ee40ef88a3ef95ad47
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:34 2010 -0200
rtl8187: avoid redundant write to register FF72 (RFSW_CTRL)
The table with misc register initialization was setting it, and later
on we would set it again with a explicity call to rtl818x_iowrite16_idx.
Remove duplicate initialization from the register table.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 60f589145d76cf834ec5e485c5412ec0994e52d1
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:33 2010 -0200
rtl8187: fix wrong register initialization in 8187B
We were using wrong address for BRSR (Basic Rate Set Register) while
initializing its value, comparing with Realtek sources, for 8187B case.
Also, the same register is initialized in rtl8187b_reg_table, so remove
the duplicate initialization from the table.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f002c25cc13e86762551c0eda29a40c60d6dbf1b
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:32 2010 -0200
rtl8187: remove setting of beacon/atim registers from initialization
On 8187B path, we set a initial value for beacon interval and atim
window on initialization. But this isn't needed, since same setup is
done on rtl8187_config.
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 327571ea9927beec2ee2ed9a266c57c1515393b4
Author: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Date: Mon Nov 1 22:59:31 2010 -0200
rtl8187: remove redundant initialization of ARFR
This removes redundant write to Auto Rate Fallback Register on RTL8187B.
The same value was being written twice in the same function. Avoid this
removing the duplicate initialization on rtl8187b_reg_table, and also
add comment for this write (information from Realtek source).
Signed-off-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6
Author: Nishant Sarmukadam <nishants(a)marvell.com>
Date: Mon Nov 1 17:55:48 2010 -0700
mwl8k: force AP mode to use non-AMPDU frames
AP firmware uses xmitcontrol to differentiate between AMPDU
and non-AMPDU frames. As the support for AMPDU is not yet
added, set xmitcontrol to non-AMPDU for all tx frames for AP
firmware. This field will be set to indicate ampdu/non-ampdu
frames when tx AMPDU support is added.
Signed-off-by: Pradeep Nemavat <pnemavat(a)marvell.com>
Signed-off-by: Brian Cavagnolo <brian(a)cozybit.com>
Acked-by: Lennert Buytenhek <buytenh(a)wantstofly.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3eedb6f436858f3e864139dc184adc9a51440c92
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Sat Oct 30 00:36:53 2010 +0200
carl9170: configurable beacon rates
Previously, the beacon rate was fixed to either:
* 1Mb/s [2.4GHz band]
* 6Mb/s [5GHz band]
This limitation has been addressed and now the
beacon rate is selected by ieee80211_tx_info's
rate control info, almost like any ordinary
data frame.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2a6cef513fab525399e484edc9bfb39b6d462f76
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:41:16 2010 +0200
carl9170: stop stale uplink BA sessions
This patch fixes a possible lengthy stall if the device
is operating as an experimental 11n AP and an STA
[during heavy txrx action] suddenly signalized to go
off-channel (old NetworkManager), or (sleep - which is
unlikely, because then it wouldn't be *active* at all!?).
Because the driver has to manage the BA Window, the
sudden PSM transition can leave active uplink BA
sessions to the STA in a bad state and a proper
cleanup is needed.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e4a668c59080f862af3ecc28b359533027cbe434
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:26:13 2010 +0200
carl9170: fix spurious restart due to high latency
RX Stress tests of unidirectional bulk traffic with
bitrates of up to 220Mbit/s have revealed that the
fatal-event recovery logic [which was solely triggered
by an out-of-rx-buffer situation] is too aggressive.
The new method now "pings" the device and then
decides - based on the response - whenever
a restart is needed or not.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e27769059ccb15273a7eb69ed31b8e08f9b0eda8
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 23:17:38 2010 +0200
carl9170: initialize HW aMPDU parameters properly
This patch changes the initial aMPDU density and
factor settings to match those of Otus.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3f1240e4f4b249f2388903864bdc766973f76687
Author: Christian Lamparter <chunkeey(a)googlemail.com>
Date: Fri Oct 29 22:44:59 2010 +0200
carl9170: import hw/fw header updates
This patch imports all shared header changes
from carl9170fw.git.
* add some strategic __aligned(4).
This allows the compiler generate optimized code for
architectures which can't access (unaligned/packed)
data efficiently.
("ath9k_hw: optimize all descriptor access functions")
* add a forgotten __CARL9170FW__ ifdef around
a private firmware-internal struct.
* GET_VAL macro helper
Very useful for extracting data out of the
bit-packed PHY registers.
* cosmetic changes
e.g.: _CCA_MINCCA_ to just _CCA_MIN_.
* version bump 1.8.8.3 -> 1.9.0.
Signed-off-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bdd7bd16439975133d36bcd7c9c489302a114525
Author: Blaise Gassend <blaise(a)willowgarage.com>
Date: Thu Oct 28 02:01:24 2010 -0700
mac80211_hwsim: Incorporate txpower into rssi
Up to now mac80211_hwsim has been reporting an rssi of -50. This patch
improves the model slightly by returning txpower-50. This makes it
easy to stimulate tests that need to see a varying rssi.
Signed-off-by: Blaise Gassend <blaise(a)willowgarage.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 19999792d2889350611ba9e346d6a2924959dc2d
Author: Thadeu Lima de Souza Cascardo <cascardo(a)holoscopio.com>
Date: Thu Oct 28 20:01:00 2010 -0200
rtl8187b: do not do per packet TX AGC
Clearing the per packet TX AGC for the RTL8187B device appears to
increase its overall TX power. This allows the device to associate and a
connection to be established using APs a little further away.
This is in accordance to what is done for RTL8187L devices and also what
Realtek drivers do.
Tested-by: Thadeu Lima de Souza Cascardo <cascardo(a)holoscopio.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo(a)holoscopio.com>
Cc: linux-wireless(a)vger.kernel.org
Cc: Larry Finger <Larry.Finger(a)lwfinger.net>
Cc: Rogerio Luz Coelho <rogluz.news(a)gmail.com>
Cc: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Cc: Hin-Tak Leung <hintak.leung(a)gmail.com>
Cc: seno <senada(a)t-online.de>
Tested-by: Herton Ronaldo Krzesinski <herton(a)mandriva.com.br>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e285a5250c0772c5596a9137041a96b2c1f744d6
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:09:58 2010 +0200
wl1271: add recover testmode command
add RECOVER testmode command.
this command triggers a recovery sequence (by enqueueing a recovery_work).
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit ccc83b046c03378bbaf7cf095d8d7e9b9abb24c5
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:09:57 2010 +0200
wl1271: handle HW watchdog interrupt
unmask the WL1271_ACX_INTR_WATCHDOG interrupt.
when getting it - enqueue a recovery work and bail out.
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 03107a4b5923aa7767329e857caf227749087e47
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:58:30 2010 +0200
wl1271: refactor debugfs function generation code
refactor wl1271_debugfs by using a format© function, instead of
duplicating the code for each generated function.
this change reduces about 3Kb from wl1271.ko
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 71125abdf0c297adc00dc5632f0318b2397286f5
Author: Eliad Peller <eliad(a)wizery.com>
Date: Thu Oct 28 21:46:43 2010 +0200
wl1271: set wl->vif only if add_interface succeeded.
set wl->vif to the newly created interface only after the firmware booted
successfully. on the way - make the function flow more clear.
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit f8d9802f66eda9ff14f7667f99a46b31e9a9e273
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Tue Oct 26 13:24:39 2010 +0200
wl1271: Check interface state in op_* functions
Check the state of the interface on op_* function so we don't try to access
the hardware in when its off.
The mac80211 may call these in some corner cases related, for instance, to
the hardware recovery procedure. These accesses cause a kernel crash on at
least some SDIO devices, because the bus is not properly claimed in that
scenario.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit b739a42c921dcb0ae92cc14032b7f75dcba88e3b
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Tue Oct 26 13:24:38 2010 +0200
wl1271: Fix scan failure detection
In scan_complete_work, because the mutex is released before accessing the
scan->failed flag, it is possible for unfounded hardware recovery rounds
to be executed.
Fix this.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf
Author: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Date: Mon Oct 25 11:24:29 2010 +0200
wl1271: Fix RX path stall
The wl1271_rx function loops through packets in an aggregated buffer. Each
packet in the buffer is handled by a call to wl1271_rx_handle_data, which will
fail if skb memory allocation fails or production mode is enabled. These
failures currently prevent the rx counters to be incremented, thus causing the
rx loop to run forever.
Fix this by ignoring error codes reported wl1271_rx_handle_data function.
This essentially means that frames will be dropped in production mode, which
is the intetion, and frames will be dropped if memory allocation fails, which
is a decent way to recover from that situation.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit ff6d76fd3d45ed5494287e57d76073739721214b
Author: Nicolas Kaiser <nikai(a)nikai.net>
Date: Mon Oct 25 15:30:03 2010 +0200
wireless/wl1271: remove redundant if-statement v2
wl1271_ps_elp_sleep() is void and cannot return a value.
Signed-off-by: Nicolas Kaiser <nikai(a)nikai.net>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 5404643139c16e56d31a6ebd09cfa6db1eb03a36
Author: Luciano Coelho <luciano.coelho(a)nokia.com>
Date: Wed Oct 20 15:15:52 2010 +0300
wl1271: exit ELP mode when setting enabled rates in tx
This bug was being triggered by a call to acx_rate_policies in tx_work
without calling ps_elp_wakeup first. If we have full PSM enabled, this
happens rather often, immediately after association.
Reported-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila(a)nokia.com>
commit 6a2de93b2553c2e9a72997370534993c85c1eee6
Author: Teemu Paasikivi <ext-teemu.3.paasikivi(a)nokia.com>
Date: Thu Oct 14 11:00:04 2010 +0200
wl1271: Fix warning about unsupported RX rate
While scanning, it is possible that beacon and probe response frames are
received on other band than configured to the driver. In rx status
handling this has caused "Unsupported RX rate from HW" warnings. This
patch changes the wl1271_rate_to_index function to take the band of the
received frame as a parameter instead of using value configuret to
wl->band.
Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi(a)nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 18357850b694ba3fa29363c7d86ccd8783f4a065
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Wed Oct 13 16:09:41 2010 +0200
wl1271: 11n Support, functionality and configuration ability
Add 11n ability in scan, connection and using MCS rates.
The configuration is temporary due to the code incomplete and
still in testing process. That plans to be remove in the future.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit c4db1c879679e795689ef3c9dd7d3f6568ea14c5
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Wed Oct 13 16:09:40 2010 +0200
wl1271: 11n Support, ACX Commands
Added ACX command to the FW for 11n support.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit e8b03a2b8debc6056f6f43d24f98f601097301a1
Author: Shahar Levi <shahar_levi(a)ti.com>
Date: Wed Oct 13 16:09:39 2010 +0200
wl1271: 11n Support, Add Definitions
Two acx commands: ht_capabilities & ht_information, 11n sta capabilities
macro.
Signed-off-by: Shahar Levi <shahar_levi(a)ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 2fe33e8cff354a3f320549544bffebbbab680145
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 14:49:12 2010 +0200
wl1271: Fix TX queue low watermark handling
The number of entries in the TX queue is compared to the low watermark
value each time TX completion interrupts are handled.
However, the fact that a TX completion arrived does not necessarily mean
there are any less skbs in the TX queue.
In addition, a TX completion interrupt does not necessarily mean that there
are any new available TX blocks. Thus, queuing TX work when the low
watermark is reached might not be needed.
Fix this by moving the low watermark handling to the TX work function,
and avoid queuing TX work in this case.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 25eeb9e3876a161e3afcc820c6cb72e13f9b7c7e
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 16:20:06 2010 +0200
wl1271: Allocate TX descriptors more efficiently
On each TX descriptor allocation, a free entry is found by traversing the TX
descriptors array.
Improve this by holding a bitmap of all TX descriptors, and using efficient
bit operations to search for free entries.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit a522550a283de31c7cfc30c7a129ce584e38c582
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 14:49:10 2010 +0200
wl1271: Fix TX starvation
While wl1271_irq_work handles RX directly (by calling wl1271_rx), a different
work is scheduled for transmitting packets. The IRQ work might handle more than
one interrupt during a single call, including multiple TX completion
interrupts. This might starve TX, since no packets are transmitted until all
interrupts are handled.
Fix this by calling the TX work function directly, instead of deferring
it.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 6c6e669ed6282788d6045397ce0f201edc400d9d
Author: Ido Yariv <ido(a)wizery.com>
Date: Tue Oct 12 14:49:09 2010 +0200
wl1271: TX aggregation optimization
In case the aggregation buffer is too small to hold all available packets,
the buffer is transferred to the FW and no more packets are aggregated.
Although there may be enough available TX blocks, no additional packets will
be handled by the current TX work.
Fix this by flushing the aggregation buffer when it's full, and continue
transferring packets as long as there are enough available TX blocks.
Signed-off-by: Ido Yariv <ido(a)wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen(a)nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit c8aea565e8f715d9f10064b1cbfbc15bf75df501
Author: Gery Kahn <geryk(a)ti.com>
Date: Tue Oct 5 16:09:05 2010 +0200
wl1271: ref_clock cosmetic changes
Cosmetic cleanup for ref_clock code while configured by board.
Signed-off-by: Gery Kahn <geryk(a)ti.com>
Signed-off-by: Luciano Coelho <luciano.coelho(a)nokia.com>
commit 34d59c07e9ad7130813c28f8554ef1298af923b7
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Sat Oct 23 09:15:46 2010 -0700
iwlagn: use 6000g2b uCode for 130 series devices
For 130 series device, 6000g2b uCode will be used, no need to
have additional defines for 130 devices, so remove those.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 69d826b6c54de113f02a73990b6f6809289b48cc
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Sat Oct 23 09:15:45 2010 -0700
iwlwifi: add new devices to Kconfig
Adding description to Kconfig to indicate more devices
are being supported by iwlagn
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f5682c01eb85fce13d064d232c947322bd7e2631
Author: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Date: Sat Oct 23 09:15:44 2010 -0700
iwlagn: turn dynamic smps on while BT is on
While BT is on and doing iscan and/or pscan, BT is in listen
mode which will impact WiFi throughput, we need to
enable dynamic smps in order to improve the rx throughput.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d4daaea656e0b5543c2e37c31934cea8f044b31e
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:43 2010 -0700
iwlwifi: implement switching iftype while up
Implement switching the interface while an
interface is up in iwlwifi. Interfaces have
to stay on the context they were created on.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit bd50a8ab9f48787109f6ff761c8f0e185e3d0690
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:42 2010 -0700
iwlwifi: fix IBSS beaconing
My previous patch to clean up all RXON handling
inadvertently broke IBSS because it failed to
take into account that unlike in AP mode, IBSS
requires beacons to be sent only after setting
the RXON assoc.
Fix this, clean up the code a bit, improve the
error checking around this, and also react to
beacon changes in IBSS mode from mac80211.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2295c66b68ae160dde2e6e2dc4f3061105153bfc
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:41 2010 -0700
iwlagn: new RXON processing for modern devices
In order to simplify the flow, and make new
enhancements easier, separate out the RXON
processing for modern AGN (5000 and newer)
from RXON processing for the older 3945 and
4965 devices. Avoid changing these old ones
to avoid regressions and move their code to
a new file (iwl-legacy.c). 4965 gets the
commit_rxon that used to be common for all
AGN devices, but with removed PAN support.
The new RXON processing is more central and
does more work in committing, so that it is
easier to follow.
To make it more evident what is split out
for legacy, split the necessary operations
for that into a new struct iwl_legacy_ops.
Those parts that still exist in the new AGN
code don't need to be parametrized.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2d4e43c3c6783f956163c11568303b0390725e28
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:40 2010 -0700
iwlagn: don't resend RXON timing
Resending RXON timing here caused issues with
dual-mode under certain circumstances, so avoid
doing it here right now.
This effectively reverts b01efe434bd6ea807eb72b
and partially 2491fa42d9bdf26075765. The next
patch will make all this cleaner for just the
devices that need it.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit dc21b5453249e7e9b8878fab356fd60b731cf04d
Author: Johannes Berg <johannes.berg(a)intel.com>
Date: Sat Oct 23 09:15:39 2010 -0700
iwlwifi: make mac80211 ops a device config
In the future, 4965 and modern AGN devices will
need to have different mac80211 callbacks since
they have different capabilities. Prepare for
that by making the mac80211 operations a device
config.
Signed-off-by: Johannes Berg <johannes.berg(a)intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 07caf9d6c9135ae25a760867f37aab90c1008380
Author: Eliad Peller <eliad(a)wizery.com>
Date: Wed Oct 27 14:58:29 2010 +0200
mac80211: refactor debugfs function generation code
refactor mac80211 debugfs code by using a format© function, instead of
duplicating the code for each generated function.
this change reduces about 600B from mac80211.ko
Signed-off-by: Eliad Peller <eliad(a)wizery.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6a6733f256f18cbcf4875e13f59eedb593b755a8
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Oct 26 15:27:25 2010 -0700
ath9k: content DMA start / stop through the PCU lock
This helps align resets / RX enable & disable / TX stop / start.
Locking around the PCU is important to ensure the hardware doesn't
get stale data when working with DMA'able data.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4bdd1e978ede034c1211957eb17eaf50de00d234
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Oct 26 15:27:24 2010 -0700
ath9k: move the PCU lock to the sc structure
The PCU lock should be used to contend TX DMA as well,
this will be done next.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9d94674ab754be0e275120a183670ead435f9c0d
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Tue Oct 26 15:27:23 2010 -0700
ath9k: simplify hw reset locking
The new PCU lock is better placed so we can just contend
against that when trying to reset hardware.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5d4c428254f73bae272be9d296724b1ee09d76ec
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Tue Oct 26 21:28:57 2010 +0530
ath9k: Properly assign boolean types
This takes care that boolean types are properly assigned
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb
Author: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Date: Tue Oct 26 20:11:29 2010 +0530
ath9k_htc: Handle monitor mode properly for HTC devices
No need to inform about monitor interface changes to
firmware. Set the HW mode to monitor type based on mac80211
indication flag is sufficient.
Signed-off-by: Rajkumar Manoharan <rmanoharan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f60dc0138aa19769bf8bab9f93b043235428b66f
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Oct 25 16:12:37 2010 -0400
iwlwifi: Convert to new PCI PM framework
Use the new PCI PM and let the PCI core code handle the PCI-specific
details of power transitions.
Based on similarly titled ath9k patch posted by Rafael J. Wysocki.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
Acked-by: Rafael J. Wysocki <rjw(a)sisk.pl>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
commit b9237578f8d685bb86901ba9ff0d379218e5a3c5
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Oct 25 10:33:07 2010 -0400
rt2x00pci: do not use GFP_DMA
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
Acked-by: Ivo van Doorn <IvDoorn(a)gmail.com>
commit 26f94dc264a7ebddcc08d3908e99880703d871e5
Author: John W. Linville <linville(a)tuxdriver.com>
Date: Mon Oct 25 10:24:09 2010 -0400
b43: remove extraneous code in free_ringmemory
This code seems to have been cut-n-pasted from alloc_ringmemory?
Anyway, it is useless.
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8e7ce8930165c785ec1c754ef3e3092a3bdffe02
Author: Hauke Mehrtens <hauke(a)hauke-m.de>
Date: Sat Oct 23 19:51:32 2010 +0200
carl9170: fix typos
Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de>
Acked-by: Christian Lamparter <chunkeey(a)googlemail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a2d9bc6fdc0c8693b5641c69bce7eaf5b47f0593
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:49 2010 +0200
b43: N-PHY: improve 2055 radio initialization
1) Upload 5 GHz values when needed.
2) Do not upload all values on first init. Follow wl.
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:48 2010 +0200
b43: N-PHY: determine usage of radio regulatory workaround correctly
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7e6da2bfc05c2b96197c12484f3d071fe0c6d0fb
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:47 2010 +0200
b43: define known SPROM boardflags2 bits
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c0b102c20972cfa3e10a0cf4a2a563edb70961b1
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Fri Oct 22 17:43:46 2010 +0200
b43: N-PHY: fix 2055 radio init
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3eb9616af24d6a1910ae6ae5c2d51719eba960cf
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:30 2010 +0200
iwlwifi: avoid commit rxon during scan in iwl_set_no_assoc
Currently we are canceling scan when changing BSSID. Behave the same
when changing association and beacon enablement, to avoid committing
rxon during scan in iwl_set_no_assoc().
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ac4f5457c7617999967e9740f8903b922714bab4
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:29 2010 +0200
iwlwifi: defer update power mode while scan
Do not set power mode when scanning, and defer that when scan finish.
We still set power mode in force case i.e. when device is overheated.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 5eda74a40587139b1d66cd8197cac92ba36e79f4
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:28 2010 +0200
iwlwifi: avoid commit rxon during scan in iwlagn_bt_traffic_change_work
Avoid sending commands to firmware (including commit_rxon) when scan
is pending and we are calling iwlagn_bt_traffic_change_work simultaneously.
Also comment some innocent race conditions.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 749ff4efa14df904c22b28e2f7b10a02119a4d5e
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:27 2010 +0200
iwlwifi: avoid commit rxon during scan in iwlagn_configure_filter
Almost anywhere in the code we avoid committing rxon while performing
scan, and make rxon commit when scan complete. However in some places
in the code we do not follow that rule. This patch fix that problem in
iwlagn_configure_filter().
Since we do not commit directly in iwl3945_configure_filter, we can
also do the same for agn, so I just remove iwlcore_commit_rxon()
function and add a comment. Also change comment for iwl3945.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a25a66ac94db88190653d5725c563e3f8faeee61
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:26 2010 +0200
iwlwifi: fix set_tx_power vs scan
According to comment in iwl_bg_scan_completed, setting tx power should
be deferred during pending scan, but we are not doing this.
This patch change code to really defer setting tx power after scan
complete. Additionally refactor iwl_set_tx_power code and call
lib->send_tx_power() directly from iwlagn_commit_rxon.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4cbf1b12491cd43032846acc6c6924d9090fa19f
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Fri Oct 22 17:04:25 2010 +0200
iwlwifi: send tx_power_cmd synchronously
On 5xxx and 6xxx change to send tx_power_cmd command synchronously,
to do not start other commands when setting tx power is pending.
We currently do the same for 4956 and 3945.
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4beeba7dc59cc10d6a47346c857d1a64a9ec9642
Author: Stanislaw Gruszka <sgruszka(a)redhat.com>
Date: Mon Oct 25 10:34:50 2010 +0200
iwlwifi: warn when send tx power settings during scan
Add WARN_ONCE when scanning is pending. Use STATUS_SCAN_HW bit since we
can have scan canceled or completed but STATUS_SCANNING bit still set.
v1 -> v2: replace EIO to EAGAIN
Signed-off-by: Stanislaw Gruszka <sgruszka(a)redhat.com>
Acked-off-by: Wey-Yi Guy <wey-yi.w.guy(a)intel.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit c7317e41df30c7e04dca46360e5ebb0cb36dda45
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Oct 21 02:47:25 2010 +0200
mac80211: minstrel_ht - reduce the overhead of rate sampling
- reduce the number of retransmission attempts for sample rates
- sample lower rates less often
- do not use RTS/CTS for sampling frames
- increase the time between sampling attempts
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ff32d9cd2c4107224a28f39d3c72eec66d566e09
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Thu Oct 21 02:47:23 2010 +0200
ath9k_hw: fix potential spurious tx error bit interpretation
According to documentation, AR_ExcessiveRetries, AR_Filtered and
AR_FIFOUnderrun are only valid if AR_FrmXmitOK is clear.
Not checking this might result in suboptimal FIFO settings, unnecessary
retransmissions, or other connectivity issues.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Cc: stable(a)kernel.org
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 78a7685e1e44c6d4b6f79c73687b9322e40b040e
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 16:07:08 2010 -0700
ath9k: add a debug warning when we cannot stop RX
We have seen several DMA races when we race against
stopping and starting the PCU. I suspect that when
we cannot stop the PCU we may hit some of these same
races so warn against them for now but only when
debugging (CONFIG_ATH_DEBUG) is enabled.
If you run into this warning and are a developer,
please fix the cause of the warning. The potential
here, although I cannot prove yet, is that the DMA
engine can be confused and start writing to a buffer
that was already DMA'd before and at least the kernel
assumes is not being accessed by hardware anymore.
Cc: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit b87b0128894efd3bbf7272a579f71b3a2bc500d1
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Thu Oct 21 12:10:11 2010 -0700
ath: add a ATH_DBG_WARN()
To be used to throw out warnings only for developers.
This can be used by some corner cases that developers
already know can be hit but developers want to address
so to avoid spewing out a warning this can only be
enabled with CONFIG_ATH_DEBUG enabled.
Cc: Ben Greear <greearb(a)candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit d91e41b690f795c04af4eb6fe28d2cafd3291051
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:59 2010 -0700
cfg80211: prefix REG_DBG_PRINT() with cfg80211
Everyone's doing it, its the cool thing.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e702d3cf29143327679ce2e2a60775eaf829f377
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Thu Oct 21 19:17:04 2010 +0530
cfg80211: add debug print when processing a channel
In the worst case you are seeing really odd things you want
more information than what is provided right now, for those
that insist and want debug info through CONFIG_CFG80211_REG_DEBUG
provide a print of when we are processing a channel and with what
regulatory rule.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a65185367f9f876448f0f12ac09a673d20371efc
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:57 2010 -0700
cfg80211: add debug print when disabling a channel on a custom regd
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 926a0a094d2b9052db3f7f37438c3d305cea4be7
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Thu Oct 21 19:17:03 2010 +0530
cfg80211: add debug prints for when we ignore regulatory hints
This can help with debugging issues. You will only see
these with CONFIG_CFG80211_REG_DEBUG enabled.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ca4ffe8f2848169a8ded0ea8a60b2d81925564c9
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:55 2010 -0700
cfg80211: fix disabling channels based on hints
After a module loads you will have loaded the world roaming regulatory
domain or a custom regulatory domain. Further regulatory hints are
welcomed and should be respected unless the regulatory hint is coming
from a country IE as the IEEE spec allows for a country IE to be a subset
of what is allowed by the local regulatory agencies.
So disable all channels that do not fit a regulatory domain sent
from a unless the hint is from a country IE and the country IE had
no information about the band we are currently processing.
This fixes a few regulatory issues, for example for drivers that depend
on CRDA and had no 5 GHz freqencies allowed were not properly disabling
5 GHz at all, furthermore it also allows users to restrict devices
further as was intended.
If you recieve a country IE upon association we will also disable the
channels that are not allowed if the country IE had at least one
channel on the respective band we are procesing.
This was the original intention behind this design but it was
completely overlooked...
Cc: David Quan <david.quan(a)atheros.com>
Cc: Jouni Malinen <jouni.malinen(a)atheros.com>
cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 749b527b21465fb079796c03ffb4302584dc31c1
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:54 2010 -0700
cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY
even if we haven't yet recieved regulatory domain hint for the driver
if it needed one. Without this Country IEs are not passed on to drivers
that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all
Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170.
This was part of the original design, however it was completely
overlooked...
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Cc: stable(a)kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 10:18:53 2010 -0700
cfg80211: pass the reg hint initiator to helpers
This is required later.
Cc: Easwar Krishnan <easwar.krishnan(a)atheros.com>
Cc: stable(a)kernel.org
signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68
Author: Stephen Hemminger <shemminger(a)vyatta.com>
Date: Wed Oct 20 10:16:58 2010 -0700
rfkill: remove dead code
The following code is defined but never used.
Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e081685c1bbe8da37c7f61726fdb783ff277f14f
Author: Larry Finger <Larry.Finger(a)lwfinger.net>
Date: Wed Oct 20 09:59:33 2010 -0500
ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices
MMIO log traces obtained using the Broadcom wl hybrid driver show that
the RETRY_TIMEOUT register (0x41) in PCI configuration space is cleared
if non-zero. Similar code found in other drivers such as ipw2100 show
this operation is needed to keep PCI Tx retries from interfering with
C3 CPU state. There are no known cases where omission of this code has
caused a problem, but this patch is offered just in case such a situation
occurs.
Signed-off-by: Larry Finger <Larry.Finger(a)lwfinger.net>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 14fb7c17e97ea0fcc545393fb1f34e6541647b5b
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 06:59:38 2010 -0700
ath5k: make ath5k_update_bssid_mask_and_opmode() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/base.c:569:6: warning: symbol
'ath5k_update_bssid_mask_and_opmode' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f8c2a0871b8462481a02445b38a7321ad63bfc88
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 06:59:37 2010 -0700
ath: make ath_hw_set_keycache_entry() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/key.c
drivers/net/wireless/ath/key.c:110:6: warning: symbol
'ath_hw_set_keycache_entry' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit a3685d119dacb07a7080169fea2847ef385b209f
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Wed Oct 20 06:59:36 2010 -0700
ath: make ath_hw_keysetmac() static
This fixes this sparse warning:
CHECK drivers/net/wireless/ath/key.c
drivers/net/wireless/ath/key.c:70:6: warning: symbol 'ath_hw_keysetmac' was not declared. Should it be static?
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit babcbc295fee766ca710235e431686fef744d9a6
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Oct 20 02:09:46 2010 +0200
ath9k: initialize per-channel tx power limits instead of hardcoding them
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit de40f316c01b1ba9535e6dc99f6a67e7655b07da
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Oct 20 03:08:53 2010 +0200
ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower
ath9k_hw_set_txpowerlimit gets an extra boolean parameter that - if set -
causes the rate txpower table and the regulatory limit to be calculated
and stored, without changing hardware registers.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 6b7b6cf553f881d45bb37a73f5db956afb290a08
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Wed Oct 20 02:09:44 2010 +0200
ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003
The same is done for the older chip families as well.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 900fcf091e95fbcc773b72c770afcd2e8eda4da2
Author: Paul Mundt <lethal(a)linux-sh.org>
Date: Mon Nov 1 09:29:24 2010 +0000
net: sh_eth: Move off of deprecated I/O routines.
sh_eth is the last in-tree user of the ctrl_xxx I/O routines. This simply
converts them over to regular MMIO accesors.
Signed-off-by: Paul Mundt <lethal(a)linux-sh.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 636e19a34275d7d6fda0fefa965b1e2a715e2b02
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Sat Oct 30 14:22:42 2010 +0000
net: consolidate 8021q tagging
Now that VLAN packets are tagged in dev_hard_start_xmit()
at the bottom of the stack we no longer need to tag them
in the 8021Q module (Except in the !VLAN_FLAG_REORDER_HDR
case).
This allows the accel path and non accel paths to be consolidated.
Here the vlan_tci in the skb is always set and we allow the
stack to add the actual tag in dev_hard_start_xmit().
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Sat Oct 30 14:22:37 2010 +0000
net: remove check for headroom in vlan_dev_create
It is possible for the headroom to be smaller then the
hard_header_len for a short period of time after toggling
the vlan offload setting.
This is not a hard error and skb_cow_head is called in
__vlan_put_tag() to resolve this.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 029f5fc31cdb35d6c8a7fe9a54bf21556e175988
Author: John Fastabend <john.r.fastabend(a)intel.com>
Date: Sat Oct 30 14:22:32 2010 +0000
8021q: set hard_header_len when VLAN offload features are toggled
Toggling the vlan tx|rx hw offloads needs to set the hard_header_len
as well otherwise we end up using LL_RESERVED_SPACE incorrectly.
This results in pskb_expand_head() being used unnecessarily.
Signed-off-by: John Fastabend <john.r.fastabend(a)intel.com>
Acked-by: Jesse Gross <jesse(a)nicira.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 58e998c6d23988490162cef0784b19ea274d90bb
Author: Jesse Gross <jesse(a)nicira.com>
Date: Fri Oct 29 12:14:55 2010 +0000
offloading: Force software GSO for multiple vlan tags.
We currently use vlan_features to check for TSO support if there is
a vlan tag. However, it's quite likely that the NIC is not able to
do TSO when there is an arbitrary number of tags. Therefore if there
is more than one tag (in-band or out-of-band), fall back to software
emulation.
Signed-off-by: Jesse Gross <jesse(a)nicira.com>
CC: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c8d5bcd1aff89199cde4bd82c5c40fb704c8bba4
Author: Jesse Gross <jesse(a)nicira.com>
Date: Fri Oct 29 12:14:54 2010 +0000
offloading: Support multiple vlan tags in GSO.
We assume that hardware TSO can't support multiple levels of vlan tags
but we allow it to be done. Therefore, enable GSO to parse these tags
so we can fallback to software.
Signed-off-by: Jesse Gross <jesse(a)nicira.com>
CC: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e1e78db628b33c657944865e3bca01ee59cc5b80
Author: Jesse Gross <jesse(a)nicira.com>
Date: Fri Oct 29 12:14:53 2010 +0000
offloading: Make scatter/gather more tolerant of vlans.
When checking if it is necessary to linearize a packet, we currently
use vlan_features if the packet contains either an in-band or out-
of-band vlan tag. However, in-band tags aren't special in any way
for scatter/gather since they are part of the packet buffer and are
simply more data to DMA. Therefore, only use vlan_features for out-
of-band tags, which could potentially have some interaction with
scatter/gather.
Signed-off-by: Jesse Gross <jesse(a)nicira.com>
CC: Ben Hutchings <bhutchings(a)solarflare.com>
Reviewed-by: Ben Hutchings <bhutchings(a)solarflare.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 410989f65151557701ce86875b141e694281dd6c
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:43 2010 +0000
cxgb4vf: Advertise NETIF_F_TSO_ECN.
Advertise NETIF_F_TSO_ECN.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4204875dd4b3c3e40e0294a8c2619fdf9e5907e1
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:42 2010 +0000
cxgb4vf: fix up "Section Mismatch" compiler warning.
Fix up "Section Mismatch" compiler warning and mark another routine as
__devinit.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f12fe3536bebcbd2ccfa80030ec7d9868c488d30
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:41 2010 +0000
cxgb4vf: add ethtool statistics for GRO.
Add ethtool statistics for GRO.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit caedda35c6dba5a283e5d87e77a8d19ee4be3183
Author: Casey Leedom <leedom(a)chelsio.com>
Date: Thu Nov 11 09:30:40 2010 +0000
cxgb4vf: minor comment/symbolic name cleanup.
Minor cleanup of comments and symbolic constant names for clarity.
Signed-off-by: Casey Leedom <leedom(a)chelsio.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d9aa93804e53f2153260568024b75ad3d81784f9
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 15 08:52:02 2010 -0800
ipv4: Fix build with multicast disabled.
net/ipv4/igmp.c: In function 'ip_mc_inc_group':
net/ipv4/igmp.c:1228: error: implicit declaration of function 'for_each_pmc_rtnl'
net/ipv4/igmp.c:1228: error: expected ';' before '{' token
net/ipv4/igmp.c: In function 'ip_mc_unmap':
net/ipv4/igmp.c:1333: error: expected ';' before 'igmp_group_dropped'
...
Move for_each_pmc_rcu and for_each_pmc_rtnl macro definitions
outside of multicast ifdef protection.
Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 7e87fe84303cc54ecf3c7b688cb08ca24322a41d
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:26:13 2010 +0100
dccp ccid-2: Separate option parsing from CCID processing
This patch replaces an almost identical replication of code: large parts
of dccp_parse_options() re-appeared as ccid2_ackvector() in ccid2.c.
Apart from the duplication, this caused two more problems:
1. CCIDs should not need to be concerned with parsing header options;
2. one can not assume that Ack Vectors appear as a contiguous area within an
skb, it is legal to insert other options and/or padding in between. The
current code would throw an error and stop reading in such a case.
Since Ack Vectors provide CCID-specific information, they are now processed
by the CCID directly, separating this functionality from the main DCCP code.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 52394eecec4e6fa677a61af26f0bd35de665344e
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:26:02 2010 +0100
dccp ccid-2: Remove old infrastructure
This removes
* functions for which updates have been provided in the preceding patches and
* the @av_vec_len field - it is no longer necessary since the buffer length is
now always computed dynamically.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit d83447f0944e73d690218d79c07762ffa4ceb9e4
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:46 2010 +0100
dccp ccid-2: Schedule Sync as out-of-band mechanism
The problem with Ack Vectors is that
i) their length is variable and can in principle grow quite large,
ii) it is hard to predict exactly how large they will be.
Due to the second point it seems not a good idea to reduce the MPS; in
particular when on average there is enough room for the Ack Vector and an
increase in length is momentarily due to some burst loss, after which the
Ack Vector returns to its normal/average length.
The solution taken by this patch is to subtract a minimum-expected Ack Vector
length from the MPS, and to defer any larger Ack Vectors onto a separate
Sync - but only if indeed there is no space left on the skb.
This patch provides the infrastructure to schedule Sync-packets for transporting
(urgent) out-of-band data. Its signalling is quicker than scheduling an Ack, since
it does not need to wait for new application data.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 18219463c884bfdb7954d298b9edb5194b14d621
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:36 2010 +0100
dccp ccid-2: Consolidate Ack-Vector processing within main DCCP module
This aggregates Ack Vector processing (handling input and clearing old state)
into one function, for the following reasons and benefits:
* all Ack Vector-specific processing is now in one place;
* duplicated code is removed;
* ensuring sanity: from an Ack Vector point of view, it is better to clear the
old state first before entering new state;
* Ack Event handling happens mostly within the CCIDs, not the main DCCP module.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 3802408644515e29fb723d51a5317301b212cf3a
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:23 2010 +0100
dccp ccid-2: Update code for the Ack Vector input/registration routine
This patch updates the code which registers new packets as received, using the
new circular buffer interface. It contributes a new algorithm which
* supports both tail/head pointers and buffer wrap-around and
* deals with overflow (head/tail move in lock-step).
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Sun Nov 14 17:25:11 2010 +0100
dccp ccid-2: Algorithm to update buffer state
This provides a routine to consistently update the buffer state when the
peer acknowledges receipt of Ack Vectors; updating state in the list of Ack
Vectors as well as in the circular buffer.
While based on RFC 4340, several additional (and necessary) precautions were
added to protect the consistency of the buffer state. These additions are
essential, since analysis and experience showed that the basic algorithm was
insufficient for this task (which lead to problems that were hard to debug).
The algorithm now
* deals with HC-sender acknowledging to HC-receiver and vice versa,
* keeps track of the last unacknowledged but received seqno in tail_ackno,
* has special cases to reset the overflow condition when appropriate,
* is protected against receiving older information (would mess up buffer state).
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit c25ecd0a21d5e08160cb5cc984f9e2b8ee347443
Merge: 190683a 9457b24
Author: David S. Miller <davem(a)davemloft.net>
Date: Sun Nov 14 11:57:05 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 190683a9d5457e6d962c232ffbecac3ab158dddd
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 10 10:50:44 2010 +0000
net: net_families __rcu annotations
Use modern RCU API / annotations for net_families array.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e85eb11782259dc39502807f3ec903a7b82b1bab
Author: Philippe De Muyter <phdm(a)macqel.be>
Date: Thu Nov 11 12:31:21 2010 +0000
net: Kconfig whitespace cleanup
Many lines in Kconfig start withe 8 spaces instead of a TAB, and even
sometimes with 7 spaces. Replace 10 or 9 spaces, or TAB + 1 space,
by TAB + 2 spaces, and 8 or 7 spaces by TAB.
Signed-off-by: Philippe De Muyter <phdm(a)macqel.be>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d7138de878d1d4210727c1200193e69596f93b3
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Nov 12 05:46:50 2010 +0000
igmp: RCU conversion of in_dev->mc_list
in_dev->mc_list is protected by one rwlock (in_dev->mc_list_lock).
This can easily be converted to a RCU protection.
Writers hold RTNL, so mc_list_lock is removed, not replaced by a
spinlock.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Cypher Wu <cypher.w(a)gmail.com>
Cc: Américo Wang <xiyou.wangcong(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit f5539b5bfa2e00f2a6fd35731db66142a2f327c0
Author: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Date: Fri Nov 12 12:43:34 2010 -0800
stmmac: update the driver documentation
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro(a)st.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c753796769e4fb0cd813b6e5801b3c01f4681d4f
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Nov 11 17:07:48 2010 -0800
ipv4: Make rt->fl.iif tests lest obscure.
When we test rt->fl.iif against zero, we're seeing if it's
an output or an input route.
Make that explicit with some helper functions.
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ed1deb7021b4dfee1d544b91edff4ef92f5c3b54
Merge: 72cdd1d b3d14bf
Author: David S. Miller <davem(a)davemloft.net>
Date: Thu Nov 11 10:43:30 2010 -0800
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
commit 72cdd1d971c0deb1619c5c339270570c43647a78
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 11 07:14:07 2010 +0000
net: get rid of rtable->idev
It seems idev field in struct rtable has no special purpose, but adding
extra atomic ops.
We hold refcounts on the device itself (using percpu data, so pretty
cheap in current kernel).
infiniband case is solved using dst.dev instead of idev->dev
Removal of this field means routing without route cache is now using
shared data, percpu data, and only potential contention is a pair of
atomic ops on struct neighbour per forwarded packet.
About 5% speedup on routing test.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Herbert Xu <herbert(a)gondor.apana.org.au>
Cc: Roland Dreier <rolandd(a)cisco.com>
Cc: Sean Hefty <sean.hefty(a)intel.com>
Cc: Hal Rosenstock <hal.rosenstock(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 46b13fc5c0f239f36e84665c73087d5fa86bfd86
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Thu Nov 11 06:57:19 2010 +0000
neigh: reorder struct neighbour
It is important to move nud_state outside of the often modified cache
line (because of refcnt), to reduce false sharing in neigh_event_send()
This is a followup of commit 0ed8ddf4045f (neigh: Protect neigh->ha[]
with a seqlock)
This gives a 7% speedup on routing test with IP route cache disabled.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c0c04c2a89cf6363da2940da59afd2e30001b991
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:04 2010 +0000
vxge: update driver version
Update vxge driver version
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 2c91308f449c6705b81bd3370a0ec647e370f35c
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:03 2010 +0000
vxge: sparse and other clean-ups
Correct issues found by running sparse on the vxge driver, as well as
other miscellaneous cleanups.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1901d042abf10d08a829961a63fd158f9844587e
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:02 2010 +0000
vxge: update Kconfig
Update Kconfig to reflect Exar's purchase of Neterion (formerly S2IO).
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ca3e3b8fae982400dacbbf19f3112cc84e51d46a
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:01 2010 +0000
vxge: correct multi-function detection
The values used to determined if the adapter is running in single or
multi-function mode were previously modified to the values necessary
when making the VXGE_HW_FW_API_GET_FUNC_MODE firmware call. However,
the firmware call was not modified. This had the driver printing out on
probe that the adapter was in multi-function mode when in single
function mode and vice versa.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e7935c9669c27c5d530bff634c0c15f7a602d697
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:26:00 2010 +0000
vxge: Titan1A detection
Detect if the adapter is Titan or Titan1A, and tune the driver for this
hardware. Also, remove unnecessary function __vxge_hw_device_id_get.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c3150eac9f2e5f770b09d371f7716540219a46f6
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:59 2010 +0000
vxge: Handle errors in vxge_hw_vpath_fw_api
Propagate the return code of the call to vxge_hw_vpath_fw_api and
__vxge_hw_vpath_pci_func_mode_get. This enables the proper handling of
error conditions when querying the function mode of the device during
probe.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b81b37338412e3215670641e5025c85146521dea
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:58 2010 +0000
vxge: add receive hardware timestamping
Add support for enable/disabling hardware timestamping on receive
packets via ioctl call. When enabled, the hardware timestamp replaces
the FCS in the payload.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e8ac175615b9458a00193c55617b5b8865e67817
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:57 2010 +0000
vxge: add support for ethtool firmware flashing
Add the ability in the vxge driver to flash firmware via ethtool.
Updated to include comments from Ben Hutchings.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 8424e00dfd5282026a93996a165fc4079d382169
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:56 2010 +0000
vxge: serialize access to steering control register
It is possible for multiple callers to access the firmware interface for
the same vpath simultaneously, resulting in uncertain output. Add locks
to serialize access. Also, make functions only accessed locally static,
thus requiring some movement of code blocks.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit ddd62726e0bc1ffe0ab791b647f4178161ab451b
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:55 2010 +0000
vxge: cleanup debug printing and asserts
Remove all of the unnecessary debug printk indirection and temporary
variables for vxge_debug_ll and vxge_assert.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 4d2a5b406c02b224bd3f50992c8b02450c65a730
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:54 2010 +0000
vxge: Wait for Rx to become idle before reseting or closing
Wait for the receive traffic to become idle before attempting to close
or reset the adapter. To enable the processing of packets while Receive
Idle, move the clearing of __VXGE_STATE_CARD_UP bit in vxge_close to
after it. Also, modify the return value of the ISR when the adapter is
down to IRQ_HANDLED. Otherwise there are unhandled interrupts for the
device.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 47f01db44b2470d9517848f6b73c75883ef5fda0
Author: Jon Mason <jon.mason(a)exar.com>
Date: Thu Nov 11 04:25:53 2010 +0000
vxge: enable rxhash
Enable RSS hashing and add ability to pass up the adapter calculated rx
hash up the network stack (if feature is available). Add the ability to
enable/disable feature via ethtool, which requires that the adapter is
not running at the time. Other miscellaneous cleanups and fixes
required to get RSS working.
Signed-off-by: Jon Mason <jon.mason(a)exar.com>
Signed-off-by: Ram Vepa <ram.vepa(a)exar.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b3d14bff12a38ad13a174eb0cc83d2ac7169eee4
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Wed Nov 10 21:21:35 2010 +0100
dccp ccid-2: Implementation of circular Ack Vector buffer with overflow handling
This completes the implementation of a circular buffer for Ack Vectors, by
extending the current (linear array-based) implementation. The changes are:
(a) An `overflow' flag to deal with the case of overflow. As before, dynamic
growth of the buffer will not be supported; but code will be added to deal
robustly with overflowing Ack Vector buffers.
(b) A `tail_seqno' field. When naively implementing the algorithm of Appendix A
in RFC 4340, problems arise whenever subsequent Ack Vector records overlap,
which can bring the entire run length calculation completely out of synch.
(This is documented on http://www.erg.abdn.ac.uk/users/gerrit/dccp/notes/\
ack_vectors/tracking_tail_ackno/ .)
(c) The buffer length is now computed dynamically (i.e. current fill level),
as the span between head to tail.
As a result, dccp_ackvec_pending() is now simpler - the #ifdef is no longer
necessary since buf_empty is always true when IP_DCCP_ACKVEC is not configured.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 7d870936602533836bba821bd5c679c62c52a95f
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Wed Nov 10 21:21:02 2010 +0100
dccp ccid-2: Separate internals of Ack Vectors from option-parsing code
This patch
* separates Ack Vector housekeeping code from option-insertion code;
* shifts option-specific code from ackvec.c into options.c;
* introduces a dedicated routine to take care of the Ack Vector records;
* simplifies the dccp_ackvec_insert_avr() routine: the BUG_ON was redundant,
since the list is automatically arranged in descending order of ack_seqno.
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit f17a37c9b8c4b32c01e501a84fa6f30e344c6110
Author: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
Date: Wed Nov 10 21:20:07 2010 +0100
dccp ccid-2: Ack Vector interface clean-up
This patch brings the Ack Vector interface up to date. Its main purpose is
to lay the basis for the subsequent patches of this set, which will use the
new data structure fields and routines.
There are no real algorithmic changes, rather an adaptation:
(1) Replaced the static Ack Vector size (2) with a #define so that it can
be adapted (with low loss / Ack Ratio, a value of 1 works, so 2 seems
to be sufficient for the moment) and added a solution so that computing
the ECN nonce will continue to work - even with larger Ack Vectors.
(2) Replaced the #defines for Ack Vector states with a complete enum.
(3) Replaced #defines to compute Ack Vector length and state with general
purpose routines (inlines), and updated code to use these.
(4) Added a `tail' field (conversion to circular buffer in subsequent patch).
(5) Updated the (outdated) documentation for Ack Vector struct.
(6) All sequence number containers now trimmed to 48 bits.
(7) Removal of unused bits:
* removed dccpav_ack_nonce from struct dccp_ackvec, since this is already
redundantly stored in the `dccpavr_ack_nonce' (of Ack Vector record);
* removed Elapsed Time for Ack Vectors (it was nowhere used);
* replaced semantics of dccpavr_sent_len with dccpavr_ack_runlen, since
the code needs to be able to remember the old run length;
* reduced the de-/allocation routines (redundant / duplicate tests).
Signed-off-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk>
commit 0c6202b3278b417444a59cecc59e6e5af04db7fd
Author: Ron Mercer <ron.mercer(a)qlogic.com>
Date: Wed Nov 10 09:29:46 2010 +0000
qlge: Version change to v1.00.00.27
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria(a)qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 673483c7d3a25c43d1208bb07e3888bc5136e8cf
Author: Ron Mercer <ron.mercer(a)qlogic.com>
Date: Wed Nov 10 09:29:45 2010 +0000
qlge: Add firmware info to ethtool get regs.
By default we add firmware information to ethtool get regs.
Optionally firmware info can instead be sent to log.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria(a)qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer(a)qlogic.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit edb40a23c8dc5b5be219bf4561074b6233bba65f
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Oct 19 16:56:54 2010 +0900
ath5k: Add channel time to survey data
Include the channel utilization (busy, rx, tx) in the survey results.
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 3dd0923de491d72a041f82a9d0aaccc473fd2c42
Author: Bruno Randolf <br1(a)einfach.org>
Date: Tue Oct 19 16:56:48 2010 +0900
ath5k: Optimize descriptor alignment
Similar to Felix Fietkau <nbd(a)openwrt.org> "ath9k_hw: optimize all descriptor
access functions" (13db2a80244908833502189a24de82a856668b8a).
Signed-off-by: Bruno Randolf <br1(a)einfach.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 123f5b8e6f411d342f2fc8a15c4d9349ace5074a
Author: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Date: Mon Oct 18 11:37:17 2010 +0530
ath9k: Remove the median function in rate control
With the current rate control selection method the median function is
nowhere used, so remove it.
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit ada9f1cacb66b74a68254521bb5e3ca4eb8fa871
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Sat Oct 16 01:01:48 2010 +0200
ath9k_hw: optimize all descriptor access functions
Because all of the descriptor data structures are marked as __packed, GCC
assumes the worst case wrt. alignment and generates unaligned load/store
instructions on MIPS for access to all fields.
Since descriptors always have to be 4-byte-aligned, we can just mark the
data structures with __aligned(4), which allows GCC to generate much more
efficient code.
Verified through disassembly and OProfile comparisons.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit f0e94b479c987abef17eb18e5c8e0ed178d00cd4
Author: Rafael J. Wysocki <rjw(a)sisk.pl>
Date: Sat Oct 16 00:36:17 2010 +0200
ath9k: Convert to new PCI PM framework
The ath9k driver uses the legacy PCI power management (suspend
and resume) callbacks that apparently cause intermittent problems
to happen (the adapter sometimes doesn't resume correctly on my
Acer Ferrari One). Make it use the new PCI PM and let the PCI core
code handle the PCI-specific details of power transitions.
Signed-off-by: Rafael J. Wysocki <rjw(a)sisk.pl>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 191d6a1186f65bc86c24b9d6d9d91acc155285ba
Author: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Date: Fri Oct 15 13:27:49 2010 -0700
ath9k: fix sparse complaint on aphy for debugfs
This fixes this sparse complaint:
CHECK drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.c:548:34: warning: symbol 'aphy' shadows an earlier one
drivers/net/wireless/ath/ath9k/debug.c:491:26: originally declared here
Signed-off-by: Luis R. Rodriguez <lrodriguez(a)atheros.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 744bcb42a1ff1b9200e82dd074468877e31ff161
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:33 2010 +0200
ath9k_hw: make ath9k_hw_gettsf32 static
It is now only used in hw.c
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 8eb1dabbd10e067cff671935d3e0c819f8e80d54
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:32 2010 +0200
ath9k: remove a redundant call to ath9k_hw_gettsf32
When the timer_next argument to ath9k_gen_timer_start is behind the tsf value,
tsf + timer_period is used, which is what ath_btcoex_period_timer was setting
it to.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 9fa23e1741404207c414fad69212a8763c138bf0
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:31 2010 +0200
ath9k: optimize/fix ANI RSSI processing
ANI needs the RSSI average only in station mode, and only for tracking
the signal strength of beacons of the AP that it is connected to.
Adjust the code to track on the beacon RSSI, and store the average of that
in the ath_wiphy struct.
With these changes, we can get rid of this extra station lookup in the
rx path, which saves precious CPU cycles.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit e0e9bc82fb0813fd353b0abbba0f1d6a680cc77c
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:30 2010 +0200
ath9k_hw: optimize tx status descriptor processing
Disassembly shows, that at least on MIPS, the compiler generates a lot of
memory accesses to the same location in the descriptor field parsing.
Since it is operating on uncached memory, this can be quite expensive in
this hot path.
Change the code a bit to help the compiler optimize it properly, and get
rid of some unused fields in the ath_tx_status struct.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 45684c75f9aa80eb477465bddcf79c9ad95206c7
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Fri Oct 15 20:03:29 2010 +0200
ath9k_hw: small optimization in ar9002_hw_get_isr
ah->config.rx_intr_mitigation does not need to be checked before checking
the rx interrupt mask for AR_ISR_RXMINTR or AR_ISR_RXINTM, as those
interrupts will be masked out if rx interrupt mitigation is disabled.
Avoid reading AR_ISR_S5_S twice by reordering the code to be more concise.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 4df3071ebd92ef7115b409da64d0eb405d24a631
Author: Felix Fietkau <nbd(a)openwrt.org>
Date: Mon Nov 8 20:54:47 2010 +0100
ath9k_hw: optimize interrupt mask changes
OProfile showed that ath9k was spending way too much time in
ath9k_hw_set_interrupts. Since most of the interrupt mask changes only
need to globally enable/disable interrupts, it makes sense to split
this part into separate functions, replacing all calls to
ath9k_hw_set_interrupts(ah, 0) with ath9k_hw_disable_interrupts(ah).
ath9k_hw_set_interrupts(ah, ah->imask) only gets changed to
ath9k_hw_enable_interrupts(ah), whenever ah->imask was not changed
since the point where interrupts were disabled.
Signed-off-by: Felix Fietkau <nbd(a)openwrt.org>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 790a11f268373b60069bc1371dc05143107c607c
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Oct 14 23:04:40 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Cc: Henry Ptasinski <henryp(a)broadcom.com>
Cc: Brett Rudley <brudley(a)broadcom.com>
Cc: Nohee Ko <noheek(a)broadcom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 794830e691a6b61d2de3fa9daeb609fd4ef4a4e7
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Sun Oct 17 15:38:51 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Cc: Henry Ptasinski <henryp(a)broadcom.com>
Cc: Brett Rudley <brudley(a)broadcom.com>
Cc: Nohee Ko <noheek(a)broadcom.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 038aaa382eb0a8fd6a0bbae7abc1383b9b57c543
Author: Rafał Miłecki <zajec5(a)gmail.com>
Date: Thu Oct 14 23:01:02 2010 +0200
b43: N-PHY: define channel table struct for rev3+ devices
Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com>
Signed-off-by: John W. Linville <linville(a)tuxdriver.com>
commit 2af6fd8b18ceed416c9dfa675287c765aabf7d43
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:53 2010 +0000
net/ipv4/tcp.c: Update WARN uses
Coalesce long formats.
Align arguments.
Remove KERN_<level>.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit b194a3674fba6d9f9e470084d192c7cb99194a62
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:52 2010 +0000
net/core/dev.c: Update WARN uses
Coalesce long formats.
Add missing newlines.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 9c413ed55d5b52159e85a3937cda7f210a318048
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:34 2010 +0000
drivers/net/usb: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c389ff80d4b598f57d56aa807d396d4351cac8a4
Author: Joe Perches <joe(a)perches.com>
Date: Sat Oct 30 11:08:33 2010 +0000
drivers/net/can: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe(a)perches.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Wed Nov 3 22:49:35 2010 +0000
drivers/net: normalize TX_TIMEOUT
Some network drivers use old TX_TIMEOUT definitions, assuming HZ=100 of
old kernels.
Convert these definitions to include HZ, since HZ can be 1000 these
days.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 973a34aa8593dbfe84386343c694f5beecb51d8a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Oct 31 05:38:25 2010 +0000
af_unix: optimize unix_dgram_poll()
unix_dgram_poll() is pretty expensive to check POLLOUT status, because
it has to lock the socket to get its peer, take a reference on the peer
to check its receive queue status, and queue another poll_wait on
peer_wait. This all can be avoided if the process calling
unix_dgram_poll() is not interested in POLLOUT status. It makes
unix_dgram_recvmsg() faster by not queueing irrelevant pollers in
peer_wait.
On a test program provided by Alan Crequy :
Before:
real 0m0.211s
user 0m0.000s
sys 0m0.208s
After:
real 0m0.044s
user 0m0.000s
sys 0m0.040s
Suggested-by: Davide Libenzi <davidel(a)xmailserver.org>
Reported-by: Alban Crequy <alban.crequy(a)collabora.co.uk>
Acked-by: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 5456f09aaf88731e16dbcea7522cb330b6846415
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Sun Oct 31 05:36:23 2010 +0000
af_unix: fix unix_dgram_poll() behavior for EPOLLOUT event
Alban Crequy reported a problem with connected dgram af_unix sockets and
provided a test program. epoll() would miss to send an EPOLLOUT event
when a thread unqueues a packet from the other peer, making its receive
queue not full.
This is because unix_dgram_poll() fails to call sock_poll_wait(file,
&unix_sk(other)->peer_wait, wait);
if the socket is not writeable at the time epoll_ctl(ADD) is called.
We must call sock_poll_wait(), regardless of 'writable' status, so that
epoll can be notified later of states changes.
Misc: avoids testing twice (sk->sk_shutdown & RCV_SHUTDOWN)
Reported-by: Alban Crequy <alban.crequy(a)collabora.co.uk>
Cc: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 67426b756c4d52c511c4b22b269accea171692a8
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 20:44:44 2010 +0000
af_unix: use keyed wakeups
Instead of wakeup all sleepers, use wake_up_interruptible_sync_poll() to
wakeup only ones interested into writing the socket.
This patch is a specialization of commit 37e5540b3c9d (epoll keyed
wakeups: make sockets use keyed wakeups).
On a test program provided by Alan Crequy :
Before:
real 0m3.101s
user 0m0.000s
sys 0m6.104s
After:
real 0m0.211s
user 0m0.000s
sys 0m0.208s
Reported-by: Alban Crequy <alban.crequy(a)collabora.co.uk>
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: Davide Libenzi <davidel(a)xmailserver.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 03:09:24 2010 +0000
decnet: RCU conversion and get rid of dev_base_lock
While tracking dev_base_lock users, I found decnet used it in
dnet_select_source(), but for a wrong purpose:
Writers only hold RTNL, not dev_base_lock, so readers must use RCU if
they cannot use RTNL.
Adds an rcu_head in struct dn_ifaddr and handle proper RCU management.
Adds __rcu annotation in dn_route as well.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Acked-by: Steven Whitehouse <swhiteho(a)redhat.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit e4a7b93bd5d84e1e79917d024d17d745d190fc9a
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 01:52:46 2010 +0000
bonding: remove dev_base_lock use
bond_info_seq_start() uses a read_lock(&dev_base_lock) to make sure
device doesn’t disappear. Same goal can be achieved using RCU.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 840a185dddfd098b78b96a30da4cad722a7aef18
Author: Eric Dumazet <eric.dumazet(a)gmail.com>
Date: Fri Oct 29 01:15:29 2010 +0000
aoe: remove dev_base_lock use from aoecmd_cfg_pkts()
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)
Convert aoecmd_cfg_pkts() to RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Cc: "Ed L. Cashin" <ecashin(a)coraid.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit 1d5439b9a29b1386d44a617cbaf2f7acde1d697c
Author: Arce, Abraham <x0066660(a)ti.com>
Date: Thu Oct 28 18:57:20 2010 +0000
ks8851: suspend resume support
Add suspend/resume support using default open/stop interface methods
to do hardware dependant operations.
On suspend, same low power state (soft power mode) will be kept, the
following blocks will be disabled:
- Internal PLL Clock
- Tx/Rx PHY
- MAC
- SPI Interface
Signed-off-by: Abraham Arce <x0066660(a)ti.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
commit d0eaeec8e8dfdc31815941054802dcccd7c3fe1d
Merge: a7bcf21 aa58163
Author: David S. Miller <davem(a)davemloft.net>
Date: Mon Nov 8 12:38:28 2010 -0800
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 8b7347aab6865ae8a2e5a8b0f1deea12da3d3aff
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Sun Sep 19 15:56:30 2010 +0200
vhost: get/put_user -> __get/__put_user
We do access_ok checks on all ring values on an ioctl,
so we don't need to redo them on each access.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit dfe5ac5b18be5b10d01a17e734a9905c0def6088
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Tue Sep 21 14:18:01 2010 +0200
vhost: copy_to_user -> __copy_to_user
We do access_ok checks at setup time, so we don't need to
redo them on each access.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 64e1c80748afca3b4818ebb232a9668bf529886d
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Wed Oct 6 15:34:45 2010 +0200
vhost-net: batch use/unuse mm
Move use/unuse mm to vhost.c which makes it possible to batch these
operations.
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 533a19b4b88fcf81da3106b94f0ac4ac8b33a248
Author: Michael S. Tsirkin <mst(a)redhat.com>
Date: Wed Oct 6 15:34:38 2010 +0200
vhost: put mm after thread stop
makes it possible to batch use/unuse mm
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
commit 3fcedec752108de5d99b9f0373ff880756a1e87d
Author: Julia Lawall <julia(a)diku.dk>
Date: Tue Oct 26 12:25:32 2010 +0200
drivers/vhost/vhost.c: delete double assignment
Delete successive assignments to the same location.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression i;
@@
*i = ...;
i = ...;
// </smpl>
Signed-off-by: Julia Lawall <julia(a)diku.dk>
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
-----------------------------------------------------------------------
--
linux integration
1
0
20 Dec '10
The following commit has been merged in the next branch:
commit 0e15fe7029743f2f3eb407bf5fa5867adb108096
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sun Dec 19 20:22:09 2010 +0100
batman-adv: Return hna count on local buffer fill
hna_local_fill_buffer must return the number of added hna entries and
not the last checked hash bucket.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
diff --git a/translation-table.c b/translation-table.c
index a19e16c..a633b5a 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -162,7 +162,7 @@ int hna_local_fill_buffer(struct bat_priv *bat_priv,
atomic_set(&bat_priv->hna_local_changed, 0);
spin_unlock_bh(&bat_priv->hna_lhash_lock);
- return i;
+ return count;
}
int hna_local_seq_print_text(struct seq_file *seq, void *offset)
--
batman-adv
1
0
batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10
by postmaster＠open-mesh.org 19 Dec '10
19 Dec '10
The following commit has been merged in the master branch:
commit 91d18ffbaada039bb507fbc3182c23a9941607c6
Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>
Date: Thu Apr 19 16:59:32 2007 +0200
- hash_init() when doing hash_new(), fixes unitialized table bug.
diff --git a/hash.c b/hash.c
index 48147b3..a000099 100644
--- a/hash.c
+++ b/hash.c
@@ -156,6 +156,7 @@ struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_cho
debugFree(hash, 1305);
return(NULL);
}
+ hash_init(hash);
hash->compare= compare;
hash->choose= choose;
return(hash);
--
batman; test conversation
1
0