summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2016-05-1026-295/+465
|\
| * batman-adv: use batadv_compare_eth when possibleAntonio Quartulli2016-05-101-4/+2
| * batman-adv: replace ethertype variable with ETH_P_BATMAN for readabilityMarek Lindner2016-05-101-4/+4
| * batman-adv: Use bool as return type for boolean functionsSven Eckelmann2016-05-1018-199/+205
| * batman-adv: Use kref_get for _batadv_update_routeSven Eckelmann2016-05-101-4/+4
| * batman-adv: Use kref_get for hard_iface subfunctionsSven Eckelmann2016-05-103-38/+13
| * batman-adv: Use kref_get for batadv_gw_node_addSven Eckelmann2016-05-101-6/+2
| * batman-adv: Use kref_get for batadv_gw_selectSven Eckelmann2016-05-101-2/+2
| * batman-adv: Use kref_get for batadv_nc_get_nc_nodeSven Eckelmann2016-05-101-6/+1
| * batman-adv: Use kref_get for batadv_tvlv_container_getSven Eckelmann2016-05-101-3/+1
| * batman-adv: Increase hard_iface refcnt for ptypeSven Eckelmann2016-05-101-0/+2
| * batman-adv: Check hard_iface refcnt when receiving skbSven Eckelmann2016-05-101-1/+13
| * batman-adv: Check hard_iface refcnt before calling functionSven Eckelmann2016-05-104-1/+35
| * batman-adv: add detection for complex bridge loopsSimon Wunderlich2016-05-105-2/+156
| * batman-adv: Create batman soft interfaces within correct netns.Andrew Lunn2016-05-106-12/+18
| * batman-adv: NETIF_F_NETNS_LOCAL feature to prevent netns movesAndrew Lunn2016-05-101-1/+1
| * batman-adv: Remove hdr_size skb size check in batadv_interface_rxSven Eckelmann2016-05-101-4/+0
| * batman-adv: Remove unused parameter recv_if of batadv_interface_rxSven Eckelmann2016-05-103-8/+6
* | skbuff: remove unused variable `doff'Sowmini Varadhan2016-05-101-6/+0
* | ila: ipv6/ila: fix nlsize calculation for lwtunnelTom Herbert2016-05-101-2/+4
* | gtp: reload GTPv1 header after pskb_may_pull()Pablo Neira2016-05-101-0/+2
* | block/drbd: align properly u64 in nl messagesNicolas Dichtel2016-05-102-13/+22
* | Merge branch 'phy_ksettings'David S. Miller2016-05-104-51/+49
|\ \
| * | net: ethernet: fec: use phy_ethtool_{get|set}_link_ksettingsPhilippe Reynes2016-05-101-24/+2
| * | net: ethernet: fec: use phydev from struct net_devicePhilippe Reynes2016-05-102-29/+21
| * | net: phy: add phy_ethtool_{get|set}_link_ksettingsPhilippe Reynes2016-05-102-0/+28
|/ /
* | Merge tag 'linux-can-next-for-4.7-20160509' of git://git.kernel.org/pub/scm/l...David S. Miller2016-05-109-80/+367
|\ \
| * | can: ifi: Add more detailed error reportingMarek Vasut2016-05-091-6/+107
| * | can: ifi: Increment TX counters only on real transmissionMarek Vasut2016-05-091-2/+4
| * | can: ifi: Treat CAN_CTRLMODE_FD_NON_ISO correctlyMarek Vasut2016-05-091-2/+3
| * | can: ifi: Unify timing constantsMarek Vasut2016-05-091-13/+1
| * | can: ifi: Update timing configuration codeMarek Vasut2016-05-091-33/+21
| * | can: ifi: Start NAPI poll on bus warning tooMarek Vasut2016-05-091-2/+3
| * | can: gs_usb: modify the usb device table to use only the first usb interfaceMaximilian Schneider2016-05-091-1/+2
| * | can: janz-ican3: error handling for CAL/CANopen firmwareAndreas Gröger2016-05-091-9/+95
| * | can: fix handling of unmodifiable configuration optionsOliver Hartkopp2016-05-093-7/+73
| * | can: mcp251x: Replace create_freezable_workqueue with alloc_workqueueAmitoj Kaur Chawla2016-05-091-1/+2
| * | can: sja1000: plx_pci: Add support for Marathon CAN-bus-PCIe cardNikita Edward Baruzdin2016-05-091-8/+56
| * | can: sja1000: Fix error location forwardingAlexander Gerasiov2016-05-091-1/+5
* | | gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)Pablo Neira2016-05-108-1/+1462
| |/ |/|
* | netfilter: conntrack: remove uninitialized shadow variableArnd Bergmann2016-05-101-1/+0
* | Merge branch 'ip6-tunnel-tx-fixes'David S. Miller2016-05-102-29/+28
|\ \
| * | ip6_gre: Use correct flags for reading TUNNEL_SEQTom Herbert2016-05-101-2/+2
| * | ip6: Don't set transport header in IPv6 tunnelingTom Herbert2016-05-101-2/+0
| * | ip6_gre: Set inner protocol correctly in __gre6_xmitTom Herbert2016-05-101-1/+1
| * | gre6: Fix flag translationsTom Herbert2016-05-101-8/+12
| * | ip6_gre: Fix MTU settingTom Herbert2016-05-101-16/+13
|/ /
* | stmmac: dwmac-socfpga: make socfpga_dwmac_pm_ops staticJoachim Eastwood2016-05-091-1/+2
* | Merge branch 'l3mdev-send-enslaved'David S. Miller2016-05-095-54/+73
|\ \
| * | net: l3mdev: Allow send on enslaved interfaceDavid Ahern2016-05-093-4/+19