Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Linus Torvalds [Tue, 2 Oct 2012 20:38:27 +0000 (13:38 -0700)]
Pull networking changes from David Miller:

 1) GRE now works over ipv6, from Dmitry Kozlov.

 2) Make SCTP more network namespace aware, from Eric Biederman.

 3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.

 4) Make openvswitch network namespace aware, from Pravin B Shelar.

 5) IPV6 NAT implementation, from Patrick McHardy.

 6) Server side support for TCP Fast Open, from Jerry Chu and others.

 7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel
    Borkmann.

 8) Increate the loopback default MTU to 64K, from Eric Dumazet.

 9) Use a per-task rather than per-socket page fragment allocator for
    outgoing networking traffic.  This benefits processes that have very
    many mostly idle sockets, which is quite common.

    From Eric Dumazet.

10) Use up to 32K for page fragment allocations, with fallbacks to
    smaller sizes when higher order page allocations fail.  Benefits are
    a) less segments for driver to process b) less calls to page
    allocator c) less waste of space.

    From Eric Dumazet.

11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.

12) VXLAN device driver, one way to handle VLAN issues such as the
    limitation of 4096 VLAN IDs yet still have some level of isolation.
    From Stephen Hemminger.

13) As usual there is a large boatload of driver changes, with the scale
    perhaps tilted towards the wireless side this time around.

Fix up various fairly trivial conflicts, mostly caused by the user
namespace changes.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)
  hyperv: Add buffer for extended info after the RNDIS response message.
  hyperv: Report actual status in receive completion packet
  hyperv: Remove extra allocated space for recv_pkt_list elements
  hyperv: Fix page buffer handling in rndis_filter_send_request()
  hyperv: Fix the missing return value in rndis_filter_set_packet_filter()
  hyperv: Fix the max_xfer_size in RNDIS initialization
  vxlan: put UDP socket in correct namespace
  vxlan: Depend on CONFIG_INET
  sfc: Fix the reported priorities of different filter types
  sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP
  sfc: Fix loopback self-test with separate_tx_channels=1
  sfc: Fix MCDI structure field lookup
  sfc: Add parentheses around use of bitfield macro arguments
  sfc: Fix null function pointer in efx_sriov_channel_type
  vxlan: virtual extensible lan
  igmp: export symbol ip_mc_leave_group
  netlink: add attributes to fdb interface
  tg3: unconditionally select HWMON support when tg3 is enabled.
  Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"
  gre: fix sparse warning
  ...

44 files changed:
1  2 
MAINTAINERS
drivers/Makefile
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/virtio_net.c
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/iwlegacy/common.h
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/rtlwifi/pci.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
drivers/net/wireless/rtlwifi/rtl8192de/fw.c
drivers/s390/net/qeth_core_main.c
firmware/Makefile
include/linux/Kbuild
include/linux/netdevice.h
include/linux/sched.h
include/net/sock.h
include/net/xfrm.h
kernel/audit.c
kernel/fork.c
kernel/taskstats.c
net/core/dev.c
net/core/dst.c
net/core/link_watch.c
net/core/neighbour.c
net/core/netprio_cgroup.c
net/core/sock.c
net/netfilter/nfnetlink_log.c
net/netlabel/netlabel_unlabeled.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c
net/xfrm/xfrm_user.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -122,10 -128,12 +123,11 @@@ static void ath_pci_aspm_init(struct at
        if (!parent)
                return;
  
-       if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {
+       if ((ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) &&
+           (AR_SREV_9285(ah))) {
 -              /* Bluetooth coexistance requires disabling ASPM for AR9285. */
 -              pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &aspm);
 -              aspm &= ~(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
 -              pci_write_config_byte(pdev, pos + PCI_EXP_LNKCTL, aspm);
 +              /* Bluetooth coexistance requires disabling ASPM. */
 +              pcie_capability_clear_word(pdev, PCI_EXP_LNKCTL,
 +                      PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
  
                /*
                 * Both upstream and downstream PCIe components should
Simple merge
Simple merge
@@@ -40,9 -40,9 +40,8 @@@ fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-
                             bnx2/bnx2-mips-06-6.2.1.fw \
                             bnx2/bnx2-rv2p-06-6.0.15.fw
  fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
 -fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
  fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
                                   cxgb3/t3c_psram-1.1.0.bin \
-                                  cxgb3/t3fw-7.10.0.bin \
                                   cxgb3/ael2005_opt_edc.bin \
                                   cxgb3/ael2005_twx_edc.bin \
                                   cxgb3/ael2020_twx_edc.bin
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/audit.c
@@@ -750,7 -763,7 +750,7 @@@ static int audit_receive_msg(struct sk_
                                        size--;
                                audit_log_n_untrustedstring(ab, data, size);
                        }
-                       audit_set_pid(ab, NETLINK_CB(skb).pid);
 -                      audit_set_pid(ab, pid);
++                      audit_set_pid(ab, NETLINK_CB(skb).portid);
                        audit_log_end(ab);
                }
                break;
                }
                /* fallthrough */
        case AUDIT_LIST:
-               err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
+               err = audit_receive_filter(msg_type, NETLINK_CB(skb).portid,
 -                                         uid, seq, data, nlmsg_len(nlh),
 +                                         seq, data, nlmsg_len(nlh),
                                           loginuid, sessionid, sid);
                break;
        case AUDIT_ADD_RULE:
                }
                /* fallthrough */
        case AUDIT_LIST_RULES:
-               err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid,
+               err = audit_receive_filter(msg_type, NETLINK_CB(skb).portid,
 -                                         uid, seq, data, nlmsg_len(nlh),
 +                                         seq, data, nlmsg_len(nlh),
                                           loginuid, sessionid, sid);
                break;
        case AUDIT_TRIM:
                break;
        case AUDIT_TTY_GET: {
                struct audit_tty_status s;
 -              struct task_struct *tsk;
 -              unsigned long flags;
 -
 -              rcu_read_lock();
 -              tsk = find_task_by_vpid(pid);
 -              if (tsk && lock_task_sighand(tsk, &flags)) {
 -                      s.enabled = tsk->signal->audit_tty != 0;
 -                      unlock_task_sighand(tsk, &flags);
 -              } else
 -                      err = -ESRCH;
 -              rcu_read_unlock();
 -
 -              if (!err)
 -                      audit_send_reply(NETLINK_CB(skb).portid, seq,
 -                                       AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
 +              struct task_struct *tsk = current;
 +
 +              spin_lock_irq(&tsk->sighand->siglock);
 +              s.enabled = tsk->signal->audit_tty != 0;
 +              spin_unlock_irq(&tsk->sighand->siglock);
 +
-               audit_send_reply(NETLINK_CB(skb).pid, seq,
++              audit_send_reply(NETLINK_CB(skb).portid, seq,
 +                               AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
                break;
        }
        case AUDIT_TTY_SET: {
diff --cc kernel/fork.c
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
diff --cc net/core/dst.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1648,10 -1648,10 +1648,10 @@@ static int xfrm_get_policy(struct sk_bu
                        err = PTR_ERR(resp_skb);
                } else {
                        err = nlmsg_unicast(net->xfrm.nlsk, resp_skb,
-                                           NETLINK_CB(skb).pid);
+                                           NETLINK_CB(skb).portid);
                }
        } else {
 -              uid_t loginuid = audit_get_loginuid(current);
 +              kuid_t loginuid = audit_get_loginuid(current);
                u32 sessionid = audit_get_sessionid(current);
                u32 sid;
  
@@@ -1985,10 -1985,10 +1985,10 @@@ static int xfrm_add_sa_expire(struct sk
        err = -EINVAL;
        if (x->km.state != XFRM_STATE_VALID)
                goto out;
-       km_state_expired(x, ue->hard, current->pid);
+       km_state_expired(x, ue->hard, nlh->nlmsg_pid);
  
        if (ue->hard) {
 -              uid_t loginuid = audit_get_loginuid(current);
 +              kuid_t loginuid = audit_get_loginuid(current);
                u32 sessionid = audit_get_sessionid(current);
                u32 sid;