summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bnx2x, bnx2fc, bnx2i, cnic: Add statistics support and FCoE capabilities ↵Barak Witkowski2012-06-2713-139/+420
| | | | | | | | | | | | | | | | advertisement 1. When FCoE offload driver is registered, copy its capabilities to the chip scratchpad. 2. Copy FCoE/iSCSI MAC addresses in aligned manner to chip scratchpad. 3. Add FCoE/iSCSI statistics collection support Signed-off-by: Barak Witkowski <barak@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: Eddie Wai <eddie.wai@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* 6lowpan: double unlock on an error pathDan Carpenter2012-06-271-1/+1
| | | | | | | | | | We already unlocked a few lines earlier here, so we can go directly to drop without passing through unlock. This was introduced recently in c5d3687f6c ('6lowpan: read data from skb safely'). Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netlink: Delete NLMSG_PUT and NLMSG_NEW.David S. Miller2012-06-261-8/+0
| | | | | | | No longer used and a poor interface as they were macros with embedded gotos. Signed-off-by: David S. Miller <davem@davemloft.net>
* pkt_sched: sch_api: Move away from NLMSG_NEW().David S. Miller2012-06-261-10/+14
| | | | | | | And use nlmsg_data() while we're here too, as well as remove a useless cast. Signed-off-by: David S. Miller <davem@davemloft.net>
* pkt_sched: cls_api: Move away from NLMSG_NEW().David S. Miller2012-06-261-5/+7
| | | | | | | And use nlmsg_data() while we're here too, as well as remove a useless cast. Signed-off-by: David S. Miller <davem@davemloft.net>
* decnet: dn_table: Move away from NLMSG_NEW().David S. Miller2012-06-261-5/+6
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* decnet: dn_route: Move away from NLMSG_NEW().David S. Miller2012-06-261-5/+7
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* audit: netlink: Move away from NLMSG_NEW().David S. Miller2012-06-261-10/+13
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* infiniband: netlink: Move away from NLMSG_NEW().David S. Miller2012-06-261-4/+6
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* selinux: netlink: Move away from NLMSG_PUT().David S. Miller2012-06-261-4/+7
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* unix_diag: Move away from NLMSG_PUT().David S. Miller2012-06-261-11/+13
| | | | | | | And use nlmsg_data() while we're here too and remove useless casts. Signed-off-by: David S. Miller <davem@davemloft.net>
* pkt_sched: act_api: Move away from NLMSG_PUT().David S. Miller2012-06-261-28/+31
| | | | | | | | Move away from NLMSG_NEW() as well. And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* netfilter: nfnetlink_queue_core: Move away from NLMSG_PUT().David S. Miller2012-06-261-9/+13
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* netfilter: nfnetlink_log: Move away from NLMSG_PUT().David S. Miller2012-06-261-13/+16
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* netfilter: ipt_ULOG: Move away from NLMSG_PUT().David S. Miller2012-06-261-7/+8
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* inet_diag: Move away from NLMSG_PUT().David S. Miller2012-06-261-19/+24
| | | | | | | And use nlmsg_data() while we're here too, and remove useless casts. Signed-off-by: David S. Miller <davem@davemloft.net>
* decnet: dn_rtmsg: Move away from NLMSG_PUT().David S. Miller2012-06-261-10/+10
| | | | | | | | And use nlmsg_data() while we're here too. Also, remove pointless kernel log message. Signed-off-by: David S. Miller <davem@davemloft.net>
* netfilter: ebt_ulog: Move away from NLMSG_PUT().David S. Miller2012-06-261-13/+10
| | | | | | | | | And use nlmsg_data() while we're here too. Also, free and NULL out skb when nlmsg_put() fails and remove pointless kernel log message. Signed-off-by: David S. Miller <davem@davemloft.net>
* gdm72xx: Move away from NLMSG_PUT().David S. Miller2012-06-261-4/+6
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* connector: Move cn_test.c away from NLMSG_PUT().David S. Miller2012-06-261-7/+6
| | | | | | And use nlmsg_data() while we're here too. Signed-off-by: David S. Miller <davem@davemloft.net>
* connector: use nlmsg_put() instead of NLMSG_PUT() macro.Javier Martinez Canillas2012-06-261-6/+6
| | | | | | | | | | | The NLMSG_PUT() macro contains a hidden goto which makes the code hard to audit and very error prone. While been there also use the inline function nlmsg_data() instead of the NLMSG_DATA() macro to do explicit type checking. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* team: remove unused rcu_head field from team_port structJiri Pirko2012-06-261-1/+0
| | | | | Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* team: do not allow to map disabled portsJiri Pirko2012-06-263-4/+6
| | | | | Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* team: fix team_adjust_ops with regard to enabled portsJiri Pirko2012-06-261-11/+19
| | | | | | | | team_adjust_ops should check for enabled ports, not all ports. This may lead to division by zero. This patch fixes this. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* mac802154: add monitor listener to TX datapathalex.bluesman.smirnov@gmail.com2012-06-261-0/+2
| | | | | | | | Add monitor receive callback to the TX datapath to catch all the data sent to transceivers. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* drivers/ieee802154: add support for the at86rf230/231 transceiversalex.bluesman.smirnov@gmail.com2012-06-264-0/+1003
| | | | | | | | | | | The AT86RF231 is a feature rich, low-power 2.4 GHz radio transceiver designed for industrial and consumer ZigBee/IEEE 802.15.4, 6LoWPAN, RF4CE and high data rate 2.4 GHz ISM band applications. This patch adds support for the Atmel RF230/231 radio transceivers. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* mac802154: mlme start requestalex.bluesman.smirnov@gmail.com2012-06-261-0/+25
| | | | | | | Basic preparations to start the interface. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* mac802154: page and channel setteralex.bluesman.smirnov@gmail.com2012-06-262-0/+45
| | | | | | | | A new method to set page and channel values for a transceiver was added to the MIB. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* mac802154: short address setteralex.bluesman.smirnov@gmail.com2012-06-262-0/+18
| | | | | | | | A method to assign the IEEE802.15.4 short address was added to the MIB implementation. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* mac802154: set and get PAN idalex.bluesman.smirnov@gmail.com2012-06-262-0/+33
| | | | | | | | Two methods intended to get and set the Private Area Network identifier were added to the MIB implementation. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* mac802154: add wpan device-class supportalex.bluesman.smirnov@gmail.com2012-06-268-13/+583
| | | | | | | | | | | | | | | | | | | | Every real 802.15.4 transceiver, which works with software MAC layer, can be classified as a wpan device in this stack. So the wpan device implementation provides missing link in datapath between the device drivers and the Linux network queue. According to the IEEE 802.15.4 standard each packet can be one of the following types: - beacon - MAC layer command - ACK - data This patch adds support for the data packet-type only, but this is enough to perform data transmission and receiving over radio. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net: qmi_wwan: simplify a check in qmi_wwan_bind()Dan Carpenter2012-06-261-2/+2
| | | | | | | | | This code is easier to read if we specify which flags we want at the condition instead of at the top of the function. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net>
* ipv4: Cache ip_error() routes even when not forwarding.David S. Miller2012-06-262-18/+20
| | | | | | | | | | | | And account for the fact that, when we are not forwarding, we should bump statistic counters rather than emit an ICMP response. RP-filter rejected lookups are still not cached. Since -EHOSTUNREACH and -ENETUNREACH can now no longer be seen in ip_rcv_finish(), remove those checks. Signed-off-by: David S. Miller <davem@davemloft.net>
* ipv4: Remove unnecessary code from rt_check_expire().David S. Miller2012-06-261-23/+11
| | | | | | | | IPv4 routing cache entries no longer use dst->expires, because the metrics, PMTU, and redirect information are stored in the inetpeer cache. Signed-off-by: David S. Miller <davem@davemloft.net>
* batman-adv: fix global TT entry deletionAntonio Quartulli2012-06-251-0/+2
| | | | | | | | During the last merge involving translation-table.c something went wrong and two lines disappeared from translation-table.c. This patch recovers them. Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* batman-adv: fix condition in AP isolationAntonio Quartulli2012-06-251-1/+1
| | | | | | | | | During the last conflict resolution involving translation-table.c something went wrong and a condition in the AP isolation code was reversed. This patch fixes this problem. Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* net/sh-eth: Check return value of sh_eth_reset when chip reset failNobuhiro Iwamatsu2012-06-251-32/+56
| | | | | | | | The sh_eth_reset function resets chip, but this performs nothing when failed. This changes sh_eth_reset return an error, when this failed in reset. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net/sh-eth: Add support selecting MII function for SH7734 and R8A7740Nobuhiro Iwamatsu2012-06-252-43/+66
| | | | | | | | | Ethernet IP of SH7734 and R8A7740 has selecting MII register. The user needs to change a value according to MII to be used. This adds the function to change the value of this register. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net/ipv6/route.c: packets originating on device match loDavid McCullough2012-06-251-0/+2
| | | | | | | | | | | | | | | Fix to allow IPv6 packets originating locally to match rules with the "iff" set to "lo". This allows IPv6 rule matching work the same as it does for IPv4. From the iproute2 man page: iif NAME select the incoming device to match. If the interface is loop‐ back, the rule only matches packets originating from this host. This means that you may create separate routing tables for for‐ warded and local packets and, hence, completely segregate them. Signed-off-by: David McCullough <david_mccullough@mcafee.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif-hsi: Remove use of module parametersSjur Brændeland2012-06-252-83/+82
| | | | | | | | | | | Remove use of module parameters on caif hsi device, as rtnl configuration parameters are already supported. All caif hsi configuration data is put in cfhsi_config, and default values in hsi_default_config. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif-hsi: Replace platform device with ops structure.Sjur Brændeland2012-06-252-77/+70
| | | | | | | | | | | | Remove use of struct platform_device, and replace it with struct cfhsi_ops. Updated variable names in the same spirit: cfhsi_get_dev to cfhsi_get_ops, cfhsi->dev to cfhsi->ops and, cfhsi->dev.drv to cfhsi->ops->cb_ops. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif-hsi: Add rtnl supportSjur Brændeland2012-06-252-90/+157
| | | | | | | | | Add RTNL support for managing the caif hsi interface. The HSI HW interface is no longer registering as a device, instead we use symbol_get to get hold of the HSI API. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Documentation/networking/caif: Update documentationSjur Brændeland2012-06-251-64/+27
| | | | | | | | | Update drawing and remove description of old features. Add HSI and USB link layers to the drawing. Reported-by: Joerg Reisenweber <joerg.reisenweber@stericssion.com> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif-hsi: Remove uncecessary assignmentsSjur Brændeland2012-06-251-5/+5
| | | | | | | Remove assignment at declaration when not needed. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif-hsi: Use netdev_X instead of dev_X for printingSjur Brændeland2012-06-251-47/+47
| | | | | | | | Replace dev_X with the corresponding netdev_X print function when applicable. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif-hsi: changed test on aggregation_timeoutKim Lilliestierna XX2012-06-251-1/+1
| | | | | | | | | | Aggregation_timeout is an unsigned long, a test for less than zero can never become true, compare with zero instead. Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif-hsi: Removed dead codeKim Lilliestierna XX2012-06-251-7/+4
| | | | | | | | Simplify logic and remove dead code. Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif: Fixed potential memory leakKim Lilliestierna XX2012-06-251-8/+9
| | | | | | | | | Rearranged the allocation and packet creations to avoid potential leaks in error path. Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif: added check for potential null returnKim Lilliestierna XX2012-06-251-0/+5
| | | | | | | | Add check on NULL return from caif_get(). Signed-off-by: Kim Lilliestierna <Kim.xx.Lilliestierna@stericsson.com> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* caif: Remove unused pointer and codeKim Lilliestierna XX2012-06-251-3/+0
| | | | | | | | Removed surplus call to caif_device_list() in caif_dev.c Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud