summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ip6tnl: advertise tunnel param via rtnlNicolas Dichtel2012-11-102-0/+60
| | | | | | | | | | | It is usefull for daemons that monitor link event to have the full parameters of these interfaces when a rtnl message is sent. It allows also to dump them via rtnetlink. It is based on what is done for GRE tunnels. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* sit: advertise tunnel param via rtnlNicolas Dichtel2012-11-101-1/+56
| | | | | | | | | | | It is usefull for daemons that monitor link event to have the full parameters of these interfaces when a rtnl message is sent. It allows also to dump them via rtnetlink. It is based on what is done for GRE tunnels. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* ipip: advertise tunnel param via rtnlNicolas Dichtel2012-11-102-1/+67
| | | | | | | | | | | | It is usefull for daemons that monitor link event to have the full parameters of these interfaces when a rtnl message is sent. It allows also to dump them via rtnetlink. It is based on what is done for GRE tunnels. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* isdn: Fix typo in drivers/isdnMasanari Iida2012-11-096-6/+6
| | | | | | | Correct spelling typo in printk within drivers/isdn Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* gianfar: Fix alloc_skb_resources on -ENOMEM cleanup pathClaudiu Manoil2012-11-091-6/+8
| | | | | | | | | | | | | | | | Should gfar_init_bds() return with -ENOMEM inside gfar_alloc_skb_resources(), free_skb_resources() will be called twice in a row on the "cleanup" path, leading to duplicate kfree() calls for rx_|tx_queue->rx_|tx_skbuff resulting in segmentation fault. This patch prevents the segmentation fault to happen in the future (rx_|tx_sbkbuff set to NULL), and corrects the error path handling for gfar_init_bds(). Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* virtio_net: use net_*_ratelimited() helpersAmerigo Wang2012-11-091-8/+4
| | | | | | | | | | These can be converted to net_*_ratelimited(). Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* vmxnet3: convert BUG_ON(true) into a simple BUG()Sasha Levin2012-11-091-1/+1
| | | | | | Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* ipip: add GSO supportEric Dumazet2012-11-091-0/+12
| | | | | | | | | | | | | | | In commit 6b78f16e4b (gre: add GSO support) we added GSO support to GRE tunnels. This patch does the same for IPIP tunnels. Performance of single TCP flow over an IPIP tunnel is increased by 40% Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Maciej Żenczykowski <maze@google.com> Cc: Tom Herbert <therbert@google.com> Cc: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* doc: packet_mmap: update doc to implementation statusDaniel Borkmann2012-11-091-24/+209
| | | | | | | | | | | | | | | | | This improves the packet_mmap.txt document in the following ways: * Add initial information about different TPACKET versions * Add initial information about packet fanout * Add pointer to BPF document (since this also could be of interest) * 'Fix' minor, rather cosmetic things Information partially taken from related commit messages. Reported-by: Ronny Meeus <ronny.meeus@gmail.com> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> Cc: Ulisses Alonso Camaró <uaca@alumni.uv.es> Cc: Johann Baudy <johann.baudy@gnu-log.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* phylib: mdio: Add sysfs attribute for PHY identifiers.Nick Bowler2012-11-092-0/+23
| | | | | | | | | | This adds a phy_id sysfs attribute to MDIO devices, containing the 32-bit PHY identifier reported by the device. This attribute can be useful when debugging problems related to phy drivers. Other enumerable buses already have similar attributes. Signed-off-by: Nick Bowler <nbowler@elliptictech.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Make the wanxl firmware array constDavid Howells2012-11-091-1/+1
| | | | | | | Make the wanxl firmware array const so that it goes in the read-only section. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Fix the wanxl firmware to include missing constantsDavid Howells2012-11-093-1/+5
| | | | | | | | | | Fix the wanxl firmware to include missing constants such as PARITY_NONE. It should be #including the linux/hdlc/ioctl.h header. To make this work, we also have to guard parts of ioctl.h with !__ASSEMBLY__. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* UAPI: (Scripted) Disintegrate include/linux/hdlcDavid Howells2012-11-093-3/+3
| | | | | | | | | | | Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com> Acked-by: Krzysztof Halasa <khc@pm.waw.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
* UAPI: Fix compilation of the wanxl firmware blob.David Howells2012-11-091-1/+1
| | | | | | | | The wanxl firmware needs access to some bits of UAPI stuff, so the -I flag in the Makefile needs adjusting to point at the UAPI headers. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netconsole: add oops_only module optionAmerigo Wang2012-11-091-0/+6
| | | | | | | | | | | | Some people wants to log only oops messages via netconsole, (this is also why netoops was invented) so add a module option for netconsole. This can be tuned via /sys/module/netconsole/parameters/oops_only at run time as well. Cc: David Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* vlan: set sysfs device_type to 'vlan'Doug Goldstein2012-11-091-0/+6
| | | | | | | | | Sets the sysfs device_type to 'vlan' for udev. This makes it easier for applications that query network information via udev to identify vlans instead of using strrchr(). Signed-off-by: Doug Goldstein <cardoe@cardoe.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* irda: sh-irda: Remove SH7377 supportNobuhiro Iwamatsu2012-11-091-4/+0
| | | | | | | | The shmobile SH7377 already was removed from source tree. This remove SH7377 support for sh-irda. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* irda: sh-irda: Remove SH7367 supportNobuhiro Iwamatsu2012-11-091-1/+1
| | | | | | | | The shmobile SH7367 already was removed from source tree. This remove SH7367 support for sh-irda. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* ipv6: remove rt6i_peer_genid from rt6_info and its handlerLi RongQing2012-11-092-17/+2
| | | | | | | | | | | | 6431cbc25f(Create a mechanism for upward inetpeer propagation into routes) introduces these codes, but this mechanism is never enabled since rt6i_peer_genid always is zero whether it is not assigned or assigned by rt6_peer_genid(). After 5943634fc5 (ipv4: Maintain redirect and PMTU info in struct rtable again), the ipv4 related codes of this mechanism has been removed, I think we maybe able to remove them now. Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2012-11-0822-55/+1682
|\ | | | | | | | | | | | | | | | | | | | | Included changes: - minimal fixes to the packet layout to avoid the __packed attribute when not needed - new packet type called UNICAST_4ADDR: in this packet it is possible to find both source and destination node (in the classic UNICAST header only the destination field exists). - a new feature: Distributed ARP Table (D.A.T.). It aims to reduce ARP lookups latency by means of a simil-DHT approach.
| * batman-adv: enable fast client detection using unicast_4addr packetsAntonio Quartulli2012-11-071-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | The "early client detection mechanism" can be extended to find new clients by means of unicast_4addr packets. The unicast_4addr packet contains as well as the broadcast packet (which is currently used in this mechanism) the address of the originating node and can therefore be used to install new entries in the Global Translation Table Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
| * batman-adv: Add get_ethtool_stats() support for DATMartin Hundebøll2012-11-075-3/+65
| | | | | | | | | | | | | | Added additional counters for D.A.T. Signed-off-by: Martin Hundebøll <martin@hundeboll.net> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Distributed ARP Table - add runtime switchAntonio Quartulli2012-11-074-0/+31
| | | | | | | | | | | | | | This patch adds a runtime switch that enables the user to turn the DAT feature on or off at runtime Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Distributed ARP Table - add compile optionAntonio Quartulli2012-11-075-4/+94
| | | | | | | | | | | | | | | | | | This patch makes it possible to decide whether to include DAT within the batman-adv binary or not. It is extremely useful when the user wants to reduce the size of the resulting module by cutting off any not needed feature. Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Distributed ARP Table - add snooping functions for ARP messagesAntonio Quartulli2012-11-076-2/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | In case of an ARP message going in or out the soft_iface, it is intercepted and a special action is performed. In particular the DHT helper functions previously implemented are used to store all the ARP entries belonging to the network in order to provide a fast and unicast lookup instead of the classic broadcast flooding mechanism. Each node stores the entries it is responsible for (following the DHT rules) in its soft_iface ARP table. This makes it possible to reuse the kernel data structures and functions for ARP management. Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Distributed ARP Table - add ARP parsing functionsAntonio Quartulli2012-11-074-3/+213
| | | | | | | | | | | | | | ARP messages are now parsed to make it possible to trigger special actions depending on their types (snooping). Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Distributed ARP Table - implement local storageAntonio Quartulli2012-11-076-0/+346
| | | | | | | | | | | | | | | | Since batman-adv cannot inter-operate with the host ARP table, this patch introduces a batman-adv private storage for ARP entries exchanged within DAT. This storage will represent the node local cache in the DAT protocol. Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Distributed ARP Table - create DHT helper functionsAntonio Quartulli2012-11-079-4/+378
| | | | | | | | | | | | | | | | Add all the relevant functions in order to manage a Distributed Hash Table over the B.A.T.M.A.N.-adv network. It will later be used to store several ARP entries and implement DAT (Distributed ARP Table) Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Distributed ARP Table - add a new debug log levelAntonio Quartulli2012-11-072-2/+5
| | | | | | | | | | | | | | | | A new log level has been added to concentrate messages regarding DAT: ARP snooping, requests, response and DHT related messages. The new log level is named BATADV_DBG_DAT Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: add UNICAST_4ADDR packet typeAntonio Quartulli2012-11-076-26/+194
| | | | | | | | | | | | | | | | | | | | | | | | The current unicast packet type does not contain the orig source address. This patches add a new unicast packet (called UNICAST_4ADDR) which provides two new fields: the originator source address and the subtype (the type of the data contained in the packet payload). The former is useful to identify the node which injected the packet into the network and the latter is useful to avoid creating new unicast packet types in the future: a macro defining a new subtype will be enough. Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Mark correctly aligned headers not as __packedSven Eckelmann2012-11-071-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | Headers which are already perfectly aligned and create a 4 byte boundary non-ethernet header payload can have the __packed attribute removed. The __packed attribute doesn't change the appeareance of the packet for these headers because no extra padding is necessary to align the data members. The compiler will also create slightly faster code for loads of multi-byte members. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
| * batman-adv: Reserve extra bytes in skb for better alignmentSven Eckelmann2012-11-074-19/+22
| | | | | | | | | | | | | | | | | | | | | | The ethernet header is 14 bytes long. Therefore, the data after it is not 4 byte aligned and may cause problems on systems without unaligned data access. Reserving NET_IP_ALIGN more byes can fix the misalignment of the ethernet header. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
* | ndisc: fix a typo in a comment in ndisc_recv_na()Nicolas Dichtel2012-11-081-1/+1
| | | | | | | | | | Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | ksz884x: use module_pci_driver to simplify the codeWei Yongjun2012-11-081-12/+1
| | | | | | | | | | | | | | | | | | | | | | Use the module_pci_driver() macro to make the code simpler by eliminating module_init and module_exit calls. dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
* | bnx2x: Support loading cnic resources at run-timeMerav Sicron2012-11-0812-565/+1084
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch replaces the BCM_CNIC define with a flag which can change at run-time and which does not use the CONFIG_CNIC kconfig option. For the PF/hypervisor driver cnic is always supported, however allocation of cnic resources and configuration of the HW for offload mode is done only when the cnic module registers bnx2x. Signed-off-by: Merav Sicron <meravs@broadcom.com> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | bnx2x: HSI change for 'update' ramrodMerav Sicron2012-11-081-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | This patch updates the driver-FW HSI to support changes to the 'update' ramrod (FW supports this change since 7.8.2). This ramrod is sent when the cnic module registers bnx2x, to enable changing the nic_mode configuration in HW at run-time. Signed-off-by: Merav Sicron <meravs@broadcom.com> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | packet: tx_ring: allow the user to choose tx data offsetPaul Chavent2012-11-084-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tx data offset of packet mmap tx ring used to be : (TPACKET2_HDRLEN - sizeof(struct sockaddr_ll)) The problem is that, with SOCK_RAW socket, the payload (14 bytes after the beginning of the user data) is misaligned. This patch allows to let the user gives an offset for it's tx data if he desires. Set sock option PACKET_TX_HAS_OFF to 1, then specify in each frame of your tx ring tp_net for SOCK_DGRAM, or tp_mac for SOCK_RAW. Signed-off-by: Paul Chavent <paul.chavent@onera.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: fec: reduce spin lock time in fec_ptp_adjfreqFrank Li2012-11-081-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | move below calculate out of spin lock section diff = fep->cc.mult; diff *= ppb; diff = div_u64(diff, 1000000000ULL); diff is local variable and not neccesary in spin lock Signed-off-by: Frank Li <Frank.Li@freescale.com> Acked-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net: fec: default select FEC_PTP at mx6 platformFrank Li2012-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | Remove PPS. Limit FEC_PTP option for i.MX chip only. FEC_PTP default is on at mx6 platform. Signed-off-by: Frank Li <Frank.Li@freescale.com> Acked-by: Richard Cochran <richardcochran@gmail.com> Acked-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/at91_ether: fix comment and style issuesJoachim Eastwood2012-11-071-60/+51
| | | | | | | | | | Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/at91_ether: clean up print outsJoachim Eastwood2012-11-071-10/+7
| | | | | | | | | | | | | | | | Convert all printk's to netdev_ counterparts and fix up some printed texts. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/at91_ether: drop board_data private struct memberJoachim Eastwood2012-11-072-8/+1
| | | | | | | | | | | | | | | | No longer used after gpio phy interrupt support was removed from at91_ether. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/at91_ether: use stat function from macbJoachim Eastwood2012-11-073-42/+11
| | | | | | | | | | Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/at91_ether: use macb functions for get/set hwaddrJoachim Eastwood2012-11-071-109/+3
| | | | | | | | | | Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/macb: export macb_set_hwaddr and macb_get_hwaddrJoachim Eastwood2012-11-072-3/+7
| | | | | | | | | | | | | | for usage in at91_ether driver. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/macb: support reversed hw addrJoachim Eastwood2012-11-071-6/+18
| | | | | | | | | | | | | | | | | | | | | | This is used on one AT91RM9200 board where a bootloader stores the Ethernet address in the wrong order. Support this on macb so address setting functions can be shared with the at91_ether driver. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/macb: check all address registers setsJoachim Eastwood2012-11-071-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The macb driver in u-boot uses the first register set while the at91_ether driver in u-boot uses the second register set. By checking all register set, like at91_ether does, this code can be shared between the drivers. This only changes behavior on macb if no vaild address is found in the first register set. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: remove adapter->eq_next_idxSathya Perla2012-11-072-4/+0
| | | | | | | | | | | | | | It's not used anywhere Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: remove roce on lancerSathya Perla2012-11-073-29/+4
| | | | | | | | | | | | | | roce interface is suppored only on Skyhawk-R. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | be2net: fix access to SEMAPHORE regSathya Perla2012-11-074-22/+11
| | | | | | | | | | | | | | | | | | The SEMAPHORE register was being accessed from the csr BAR space. This BAR may not be available in some Skyhawk-R configurations. Instead, access this register via the PCI config space (it's available there too). Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-14 23:51:34 +0100