summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bridge: fix spelling of promiscuousstephen hemminger2014-05-181-1/+1
* net: bridge: fix buildAlexei Starovoitov2014-05-181-1/+1
* Merge branch 'cdc_ncm-coalesce'David S. Miller2014-05-164-187/+455
|\
| * net: cdc_ncm: do not start timer on an empty skbBjørn Mork2014-05-161-2/+2
| * net: cdc_ncm: remove redundant "disconnected" flagBjørn Mork2014-05-163-31/+2
| * net: cdc_ncm: fix argument alignmentBjørn Mork2014-05-161-6/+6
| * net: cdc_ncm: use sane defaults for rx/tx buffersBjørn Mork2014-05-162-2/+14
| * net: cdc_ncm/cdc_mbim: adding NCM protocol statisticsBjørn Mork2014-05-163-0/+108
| * net: cdc_ncm: set reasonable padding limitsBjørn Mork2014-05-162-2/+7
| * net: cdc_ncm: use true max dgram count for header estimatesBjørn Mork2014-05-162-12/+7
| * net: cdc_ncm: use ethtool to tune coalescing settingsBjørn Mork2014-05-162-3/+74
| * net: cdc_ncm: support rx_max/tx_max updates when runningBjørn Mork2014-05-161-6/+25
| * net: cdc_ncm: split .bind device initializationBjørn Mork2014-05-161-17/+19
| * net: cdc_ncm: factor out one-time device initializationBjørn Mork2014-05-161-96/+155
| * net: cdc_ncm: split out rx_max/tx_max update of setupBjørn Mork2014-05-161-31/+57
|/
* pktgen: Use seq_puts() where seq_printf() is not neededThomas Graf2014-05-161-25/+25
* Merge branch 'ieee802154-next'David S. Miller2014-05-1616-33/+2670
|\
| * ieee802154, mac802154: implement devkey record optionPhoebe Buckheister2014-05-162-0/+39
| * ieee802154: add netlink interfaces for llsecPhoebe Buckheister2014-05-165-0/+893
| * mac802154: propagate device address changes to llsecPhoebe Buckheister2014-05-162-3/+47
| * mac802154: add llsec configuration functionsPhoebe Buckheister2014-05-164-0/+274
| * ieee802154: add dgram sockopts for security controlPhoebe Buckheister2014-05-162-1/+75
| * mac802154: integrate llsec with wpan devicesPhoebe Buckheister2014-05-163-28/+103
| * mac802154: add llsec decryption methodPhoebe Buckheister2014-05-162-0/+248
| * mac802154: add llsec encryption methodPhoebe Buckheister2014-05-162-0/+255
| * mac802154: add llsec structures and mutatorsPhoebe Buckheister2014-05-164-1/+637
| * mac802154: update KconfigPhoebe Buckheister2014-05-161-0/+4
| * ieee802154: add types for link-layer securityPhoebe Buckheister2014-05-161-0/+95
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/...David S. Miller2014-05-1611-184/+176
|\
| * net/openvswitch: Use with RCU_INIT_POINTER(x, NULL) in vport-gre.cMonam Agarwal2014-05-161-1/+1
| * openvswitch: Use TCP flags in the flow key for stats.Jarno Rajahalme2014-05-161-7/+5
| * openvswitch: Fix output of SCTP mask.Jarno Rajahalme2014-05-161-4/+4
| * openvswitch: Per NUMA node flow stats.Jarno Rajahalme2014-05-164-55/+122
| * openvswitch: Remove 5-tuple optimization.Jarno Rajahalme2014-05-167-113/+32
| * openvswitch: Use ether_addr_copyJoe Perches2014-05-163-16/+16
| * openvswitch: flow_netlink: Use pr_fmt to OVS_NLERR outputJoe Perches2014-05-161-0/+2
| * openvswitch: Use net_ratelimit in OVS_NLERRJoe Perches2014-05-161-3/+5
| * openvswitch: Added (unsigned long long) cast in printfDaniele Di Proietto2014-05-161-2/+2
| * openvswitch: avoid cast-qual warning in vport_privDaniele Di Proietto2014-05-161-1/+1
| * openvswitch: avoid warnings in vport_from_privDaniele Di Proietto2014-05-161-2/+2
| * openvswitch: use const in some local vars and castsDaniele Di Proietto2014-05-162-9/+13
* | Merge branch 'dt_fixed_phy'David S. Miller2014-05-167-13/+214
|\ \
| * | ARM: mvebu: use the fixed-link PHY DT binding for the Armada XP Matrix boardThomas Petazzoni2014-05-161-0/+4
| * | net: mvneta: add support for fixed linksThomas Petazzoni2014-05-161-3/+16
| * | of: provide a binding for fixed link PHYsThomas Petazzoni2014-05-163-0/+112
| * | net: phy: extend fixed driver with fixed_phy_register()Thomas Petazzoni2014-05-162-0/+72
| * | net: phy: decouple PHY id and PHY address in fixed PHY driverThomas Petazzoni2014-05-161-10/+10
|/ /
* | Merge branch 'bridge-non-promisc'David S. Miller2014-05-167-20/+294
|\ \
| * | bridge: Automatically manage port promiscuous mode.Vlad Yasevich2014-05-164-7/+116
| * | bridge: Add addresses from static fdbs to non-promisc portsVlad Yasevich2014-05-161-6/+69
OpenPOWER on IntegriCloud