1. 12 2月, 2013 4 次提交
  2. 11 2月, 2013 16 次提交
  3. 09 2月, 2013 19 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · fd502311
      David S. Miller 提交于
      Synchronize with 'net' in order to sort out some l2tp, wireless, and
      ipv6 GRE fixes that will be built on top of in 'net-next'.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fd502311
    • V
      cxgb4vf: Fix extraction of cpl_rx_pkt from the response queue descriptor · 8b9a4d56
      Vipul Pandya 提交于
      This was preventing GRO and RxCheckSum offload to happen.
      Signed-off-by: NJay Hernandez <jay@chelsio.com>
      Signed-off-by: NVipul Pandya <vipul@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8b9a4d56
    • D
      net: sctp: sctp_auth_make_key_vector: use sctp_auth_create_key · 03536e23
      Daniel Borkmann 提交于
      In sctp_auth_make_key_vector, we allocate a temporary sctp_auth_bytes
      structure with kmalloc instead of the sctp_auth_create_key allocator.
      Change this to sctp_auth_create_key as it is the case everywhere else,
      so that we also can properly free it via sctp_auth_key_put. This makes
      it easier for future code changes in the structure and allocator itself,
      since a single API is consistently used for this purpose. Also, by
      using sctp_auth_create_key we're doing sanity checks over the arguments.
      Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
      Acked-by: NVlad Yasevich <vyasevich@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      03536e23
    • E
      macvlan: add a salt to mc_hash() · 3807ff58
      Eric Dumazet 提交于
      Some multicast addresses are common to all macvlans,
      so if a multicast message has a hash value collision, we
      have to deliver a copy to all macvlans, adding significant
      latency and possible packet drops if netdev_max_backlog
      limit is hit.
      
      Having a per macvlan hash function permits to reduce the
      impact of hash collisions.
      Suggested-by: NMaciej Żenczykowski <maze@google.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NMaciej Żenczykowski <maze@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3807ff58
    • E
      macvlan: broadcast addr should be part of mc_filter · d5270430
      Eric Dumazet 提交于
      commit cd431e73 (macvlan: add multicast filter) forgot
      the broadcast case.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Reported-by: NMaciej Żenczykowski <maze@google.com>
      SIgned-off-by: NMaciej Żenczykowski <maze@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d5270430
    • A
      ipv6: fix a RCU warning in net/ipv6/ip6_flowlabel.c · 6a98dcf0
      Amerigo Wang 提交于
      This patch fixes the following RCU warning:
      
      [   51.680236] ===============================
      [   51.681914] [ INFO: suspicious RCU usage. ]
      [   51.683610] 3.8.0-rc6-next-20130206-sasha-00028-g83214f7-dirty #276 Tainted: G        W
      [   51.686703] -------------------------------
      [   51.688281] net/ipv6/ip6_flowlabel.c:671 suspicious rcu_dereference_check() usage!
      
      we should use rcu_dereference_bh() when we hold rcu_read_lock_bh().
      Reported-by: NSasha Levin <sasha.levin@oracle.com>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Signed-off-by: NCong Wang <amwang@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6a98dcf0
    • J
      drivers: net: Remove remaining alloc/OOM messages · 14f8dc49
      Joe Perches 提交于
      alloc failures already get standardized OOM
      messages and a dump_stack.
      
      For the affected mallocs around these OOM messages:
      
      Converted kmallocs with multiplies to kmalloc_array.
      Converted a kmalloc/memcpy to kmemdup.
      Removed now unused stack variables.
      Removed unnecessary parentheses.
      Neatened alignment.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Acked-by: NArend van Spriel <arend@broadcom.com>
      Acked-by: NMarc Kleine-Budde <mkl@pengutronix.de>
      Acked-by: NJohn W. Linville <linville@tuxdriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      14f8dc49
    • R
      bgmac: fix "cmdcfg" calls for promisc and loopback modes · e9ba1039
      Rafał Miłecki 提交于
      The last (bool) parameter in bgmac_cmdcfg_maskset says if the write
      should be made, even if value didn't change. Currently driver doesn't
      match the specs about (not) forcing some changes. This makes it follow
      them.
      Reported-by: NNathan Hintz <nlhintz@hotmail.com>
      Signed-off-by: NRafał Miłecki <zajec5@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e9ba1039
    • R
      bgmac: validate (and random if needed) MAC addr · d166f218
      Rafał Miłecki 提交于
      This adds check for a valid Ethernet MAC address and in case it is not,
      it will generate a valid random one, such that the adapter is still
      usable.
      Signed-off-by: NRafał Miłecki <zajec5@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d166f218
    • A
      skbuff: Move definition of NETDEV_FRAG_PAGE_MAX_SIZE · e5e67305
      Alexander Duyck 提交于
      In order to address the fact that some devices cannot support the full 32K
      frag size we need to have the value accessible somewhere so that we can use it
      to do comparisons against what the device can support.  As such I am moving
      the values out of skbuff.c and into skbuff.h.
      Signed-off-by: NAlexander Duyck <alexander.h.duyck@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e5e67305
    • L
      Linux 3.8-rc7 · 836dc9e3
      Linus Torvalds 提交于
      836dc9e3
    • L
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 39923134
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "I was going to hold these off until v3.8 was out, and send them with a
        stable tag, but as everyone else is pushing much bigger fixes which
        Linus is accepting, let's save people from the hastle of having to
        patch v3.8 back into working or use a stable kernel.
      
        Looking at the diffstat, this really is high value for its size; this
        is miniscule compared to how the -rc6 to tip diffstat currently looks.
      
        So, four patches in this set:
         - Punit Agrawal reports that the kernel no longer boots on MPCore due
           to a new assumption made in the GIC code which isn't true of
           earlier GIC designs.  This is the biggest change in this set.
         - Punit's boot log also revealed a bunch of WARN_ON() dumps caused by
           the DT-ification of the GIC support without fixing up non-DT
           Realview - which now sees a greater number of interrupts than it
           did before.
         - A fix for the DMA coherent code from Marek which uses the wrong
           check for atomic allocations; this can result in spinlock lockups
           or other nasty effects.
         - A fix from Will, which will affect all Android based platforms if
           not applied (which use the 2G:2G VM split) - this causes
           particularly 'make' to misbehave unless this bug is fixed."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7641/1: memory: fix broken mmap by ensuring TASK_UNMAPPED_BASE is aligned
        ARM: DMA mapping: fix bad atomic test
        ARM: realview: ensure that we have sufficient IRQs available
        ARM: GIC: fix GIC cpumask initialization
      39923134
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · e06b8405
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Revert iwlwifi reclaimed packet tracking, it causes problems for a
          bunch of folks.  From Emmanuel Grumbach.
      
       2) Work limiting code in brcmsmac wifi driver can clear tx status
          without processing the event.  From Arend van Spriel.
      
       3) rtlwifi USB driver processes wrong SKB, fix from Larry Finger.
      
       4) l2tp tunnel delete can race with close, fix from Tom Parkin.
      
       5) pktgen_add_device() failures are not checked at all, fix from Cong
          Wang.
      
       6) Fix unintentional removal of carrier off from tun_detach(),
          otherwise we confuse userspace, from Michael S.  Tsirkin.
      
       7) Don't leak socket reference counts and ubufs in vhost-net driver,
          from Jason Wang.
      
       8) vmxnet3 driver gets it's initial carrier state wrong, fix from Neil
          Horman.
      
       9) Protect against USB networking devices which spam the host with 0
          length frames, from Bjørn Mork.
      
      10) Prevent neighbour overflows in ipv6 for locally destined routes,
          from Marcelo Ricardo.  This is the best short-term fix for this, a
          longer term fix has been implemented in net-next.
      
      11) L2TP uses ipv4 datagram routines in it's ipv6 code, whoops.  This
          mistake is largely because the ipv6 functions don't even have some
          kind of prefix in their names to suggest they are ipv6 specific.
          From Tom Parkin.
      
      12) Check SYN packet drops properly in tcp_rcv_fastopen_synack(), from
          Yuchung Cheng.
      
      13) Fix races and TX skb freeing bugs in via-rhine's NAPI support, from
          Francois Romieu and your's truly.
      
      14) Fix infinite loops and divides by zero in TCP congestion window
          handling, from Eric Dumazet, Neal Cardwell, and Ilpo Järvinen.
      
      15) AF_PACKET tx ring handling can leak kernel memory to userspace, fix
          from Phil Sutter.
      
      16) Fix error handling in ipv6 GRE tunnel transmit, from Tommi Rantala.
      
      17) Protect XEN netback driver against hostile frontend putting garbage
          into the rings, don't leak pages in TX GOP checking, and add proper
          resource releasing in error path of xen_netbk_get_requests().  From
          Ian Campbell.
      
      18) SCTP authentication keys should be cleared out and released with
          kzfree(), from Daniel Borkmann.
      
      19) L2TP is a bit too clever trying to maintain skb->truesize, and ends
          up corrupting socket memory accounting to the point where packet
          sending is halted indefinitely.  Just remove the adjustments
          entirely, they aren't really needed.  From Eric Dumazet.
      
      20) ATM Iphase driver uses a data type with the same name as the S390
          headers, rename to fix the build.  From Heiko Carstens.
      
      21) Fix a typo in copying the inner network header offset from one SKB
          to another, from Pravin B Shelar.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (56 commits)
        net: sctp: sctp_endpoint_free: zero out secret key data
        net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree
        atm/iphase: rename fregt_t -> ffreg_t
        net: usb: fix regression from FLAG_NOARP code
        l2tp: dont play with skb->truesize
        net: sctp: sctp_auth_key_put: use kzfree instead of kfree
        netback: correct netbk_tx_err to handle wrap around.
        xen/netback: free already allocated memory on failure in xen_netbk_get_requests
        xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop.
        xen/netback: shutdown the ring if it contains garbage.
        net: qmi_wwan: add more Huawei devices, including E320
        net: cdc_ncm: add another Huawei vendor specific device
        ipv6/ip6_gre: fix error case handling in ip6gre_tunnel_xmit()
        tcp: fix for zero packets_in_flight was too broad
        brcmsmac: rework of mac80211 .flush() callback operation
        ssb: unregister gpios before unloading ssb
        bcma: unregister gpios before unloading bcma
        rtlwifi: Fix scheduling while atomic bug
        net: usbnet: fix tx_dropped statistics
        tcp: ipv6: Update MIB counters for drops
        ...
      e06b8405
    • D
      Merge branch 'wireless' · bfb235d7
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      Please accept this pull request intended for the 3.9 stream!
      
      Included are a mac80211 pull, an iwlwifi pull (actually two -- one
      was a fast-forward), a wl12xx pull, and a couple of Bluetooth pulls.
      
      On mac80211, Johannes says:
      
      "I've included
       * AKM definitions from Bing,
       * mesh fixes from Thomas, including a fix from him for me breaking his
         patch while applying,
       * channel check fix from Simon,
       * an old patch from Yoni Divinsky who doesn't even work for TI any
         more, to configure the WEP TX key for ARP offload etc.
       * MAC ACL API from Vasanth
       * a fix for the infamous chanctx_conf warning from Arnd
       * from myself, a fix for my previous aggregation changes, some cleanup
         and some improvements and fixes for WoWLAN"
      
      On iwlwifi, Johannes says:
      
      "Two small changes for iwlwifi-next, one to update all our Copyright
      notices and one to provide the RX page order."
      
      And also:
      
      "So what I have here is some cleanups, preparations and the new MVM
      (multi-virtual MAC) driver itself and (this is new) some work on the
      transport API as well as a message flooding fix."
      
      On wl12xx, Luca says:
      
      "Lots of bugfixes and improvements in our TI wireless drivers,
      including support for multi-channel.  Intended for 3.9."
      
      On Bluetooth, Gustavo says:
      
      "This is my first pull request to 3.9. The biggest changes here are from Johan
      Hedberg who made a lot of fixes in the Management interface. The issues arose
      due to a new test tool we wrote and the usage of the Management interface as
      default in BlueZ 5. The rest of the patches are more clean ups and small
      fixes."
      
      And also:
      
      "Here goes another batch intended for 3.9, the majority of the patch here are
      from Johan who is fixing many issues in the management interface that have
      appeared lately. The rest of the patches are just small improvements, fixes
      and clean ups."
      
      Along with those are the usual variety of updates/enhancements to
      the mwl8k, mwifiex, ath9k, rtlwifi, and rt2x00 drivers as well as
      a few updates for the ssb and bcma busses.  I don't think there are
      any big headliners there.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bfb235d7
    • D
      Merge branch 'sctp_keys' · a1c83b05
      David S. Miller 提交于
      Daniel Borkmann says:
      
      ====================
      Cryptographically used keys should be zeroed out when our session
      ends resp. memory is freed, thus do not leave them somewhere in the
      memory.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a1c83b05
    • D
      net: sctp: sctp_endpoint_free: zero out secret key data · b5c37fe6
      Daniel Borkmann 提交于
      On sctp_endpoint_destroy, previously used sensitive keying material
      should be zeroed out before the memory is returned, as we already do
      with e.g. auth keys when released.
      Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
      Acked-by: NVlad Yasevich <vyasevic@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b5c37fe6
    • D
      net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree · 6ba542a2
      Daniel Borkmann 提交于
      In sctp_setsockopt_auth_key, we create a temporary copy of the user
      passed shared auth key for the endpoint or association and after
      internal setup, we free it right away. Since it's sensitive data, we
      should zero out the key before returning the memory back to the
      allocator. Thus, use kzfree instead of kfree, just as we do in
      sctp_auth_key_put().
      Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6ba542a2
    • H
      atm/iphase: rename fregt_t -> ffreg_t · ab54ee80
      Heiko Carstens 提交于
      We have conflicting type qualifiers for "freg_t" in s390's ptrace.h and the
      iphase atm device driver, which causes the compile error below.
      Unfortunately the s390 typedef can't be renamed, since it's a user visible api,
      nor can I change the include order in s390 code to avoid the conflict.
      
      So simply rename the iphase typedef to a new name. Fixes this compile error:
      
      In file included from drivers/atm/iphase.c:66:0:
      drivers/atm/iphase.h:639:25: error: conflicting type qualifiers for 'freg_t'
      In file included from next/arch/s390/include/asm/ptrace.h:9:0,
                       from next/arch/s390/include/asm/lowcore.h:12,
                       from next/arch/s390/include/asm/thread_info.h:30,
                       from include/linux/thread_info.h:54,
                       from include/linux/preempt.h:9,
                       from include/linux/spinlock.h:50,
                       from include/linux/seqlock.h:29,
                       from include/linux/time.h:5,
                       from include/linux/stat.h:18,
                       from include/linux/module.h:10,
                       from drivers/atm/iphase.c:43:
      next/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration of 'freg_t' was here
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Acked-by: Nchas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ab54ee80
    • J
      Merge branch 'master' of... · f5237f27
      John W. Linville 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
      f5237f27
  4. 08 2月, 2013 1 次提交