26 Jun, 2006

1 commit


23 Jun, 2006

5 commits

  • Warning(/var/linsrc/linux-2617-g4//include/linux/skbuff.h:304): No description found for parameter 'dma_cookie'
    Warning(/var/linsrc/linux-2617-g4//include/net/sock.h:1274): No description found for parameter 'copied_early'
    Warning(/var/linsrc/linux-2617-g4//net/core/dev.c:3309): No description found for parameter 'chan'
    Warning(/var/linsrc/linux-2617-g4//net/core/dev.c:3309): No description found for parameter 'event'

    Signed-off-by: Randy Dunlap
    Signed-off-by: David S. Miller

    Randy Dunlap
     
  • This patch adds a generic segmentation offload toggle that can be turned
    on/off for each net device. For now it only supports in TCPv4.

    Signed-off-by: Herbert Xu
    Signed-off-by: David S. Miller

    Herbert Xu
     
  • This patch adds the GSO implementation for IPv4 TCP.

    Signed-off-by: Herbert Xu
    Signed-off-by: David S. Miller

    Herbert Xu
     
  • Having separate fields in sk_buff for TSO/UFO (tso_size/ufo_size) is not
    going to scale if we add any more segmentation methods (e.g., DCCP). So
    let's merge them.

    They were used to tell the protocol of a packet. This function has been
    subsumed by the new gso_type field. This is essentially a set of netdev
    feature bits (shifted by 16 bits) that are required to process a specific
    skb. As such it's easy to tell whether a given device can process a GSO
    skb: you just have to and the gso_type field and the netdev's features
    field.

    I've made gso_type a conjunction. The idea is that you have a base type
    (e.g., SKB_GSO_TCPV4) that can be modified further to support new features.
    For example, if we add a hardware TSO type that supports ECN, they would
    declare NETIF_F_TSO | NETIF_F_TSO_ECN. All TSO packets with CWR set would
    have a gso_type of SKB_GSO_TCPV4 | SKB_GSO_TCPV4_ECN while all other TSO
    packets would be SKB_GSO_TCPV4. This means that only the CWR packets need
    to be emulated in software.

    Signed-off-by: Herbert Xu
    Signed-off-by: David S. Miller

    Herbert Xu
     
  • Jeff Garzik
     

21 Jun, 2006

2 commits

  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
    [ATM]: fix broken uses of NIPQUAD in net/atm
    [SCTP]: sctp_unpack_cookie() fix
    [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
    [NET]: Prevent multiple qdisc runs
    [CONNECTOR]: Initialize subsystem earlier.
    [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length

    Linus Torvalds
     
  • * git://git.infradead.org/hdrcleanup-2.6: (63 commits)
    [S390] __FD_foo definitions.
    Switch to __s32 types in joystick.h instead of C99 types for consistency.
    Add to headers included for userspace in
    Move inclusion of out of user scope in asm-x86_64/mtrr.h
    Remove struct fddi_statistics from user view in
    Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
    Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
    Include and use __uXX types in
    Use __uXX types in , include too
    Remove private struct dx_hash_info from public view in
    Include and use __uXX types in
    Use __uXX types in for struct divert_blk et al.
    Use __u32 for elf_addr_t in , not u32. It's user-visible.
    Remove PPP_FCS from user view in , remove __P mess entirely
    Use __uXX types in user-visible structures in
    Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
    Use __uXX types for S390 DASD volume label definitions which are user-visible
    S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
    Remove unneeded inclusion of from
    Fix private integer types used in V4L2 ioctls.
    ...

    Manually resolve conflict in include/linux/mtd/physmap.h

    Linus Torvalds
     

20 Jun, 2006

4 commits

  • …e/wireless-2.6 into upstream

    Jeff Garzik
     
  • A local debugging change slipped into a previous changeset.

    When SCTP_DEBUG is off SCTP_ASSERT should do nothing.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Having two or more qdisc_run's contend against each other is bad because
    it can induce packet reordering if the packets have to be requeued. It
    appears that this is an unintended consequence of relinquinshing the queue
    lock while transmitting. That in turn is needed for devices that spend a
    lot of time in their transmit routine.

    There are no advantages to be had as devices with queues are inherently
    single-threaded (the loopback device is not but then it doesn't have a
    queue).

    Even if you were to add a queue to a parallel virtual device (e.g., bolt
    a tbf filter in front of an ipip tunnel device), you would still want to
    process the queue in sequence to ensure that the packets are ordered
    correctly.

    The solution here is to steal a bit from net_device to prevent this.

    BTW, as qdisc_restart is no longer used by anyone as a module inside the
    kernel (IIRC it used to with netif_wake_queue), I have not exported the
    new __qdisc_run function.

    Signed-off-by: Herbert Xu
    Signed-off-by: David S. Miller

    Herbert Xu
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits)
    [ETHTOOL]: Fix UFO typo
    [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.
    [SCTP]: Send only 1 window update SACK per message.
    [SCTP]: Don't do CRC32C checksum over loopback.
    [SCTP] Reset rtt_in_progress for the chunk when processing its sack.
    [SCTP]: Reject sctp packets with broadcast addresses.
    [SCTP]: Limit association max_retrans setting in setsockopt.
    [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.
    [IPV6]: Sum real space for RTAs.
    [IRDA]: Use put_unaligned() in irlmp_do_discovery().
    [BRIDGE]: Add support for NETIF_F_HW_CSUM devices
    [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
    [TG3]: Convert to non-LLTX
    [TG3]: Remove unnecessary tx_lock
    [TCP]: Add tcp_slow_start_after_idle sysctl.
    [BNX2]: Update version and reldate
    [BNX2]: Use CPU native page size
    [BNX2]: Use compressed firmware
    [BNX2]: Add firmware decompression
    [BNX2]: Allow WoL settings on new 5708 chips
    ...

    Manual fixup for conflict in drivers/net/tulip/winbond-840.c

    Linus Torvalds
     

18 Jun, 2006

20 commits


16 Jun, 2006

1 commit

  • Attached are two small patches for include/net/ieee80211.h to prepare
    for later submission of code to implement a user-space daemon that
    supplies 802.11 regulatory information.

    The first change adds a bit indicating that 802.11h rules are to be
    applied to a channel. As discussed earlier in this list, a single bit
    is unlikely to be sufficient; however, at this time I have been unable
    to find any regulations implementing differences between 802.11a and
    802.11h other than DFS, radar detection and passive scanning. A single
    bit is thus sufficient to convey to the driver that these rules should
    be obeyed.

    The second change adds comments to the freq and max_power fields of
    struct ieee80211_channel to indicate the units that are used.

    Signed-Off-By: Larry Finger
    Signed-off-by: John W. Linville

    Larry Finger
     

06 Jun, 2006

3 commits

  • My router blew up earlier, but exhibited some interesting behaviour during
    its dying moments. It was broadcasting beacons but wouldn't respond to
    any authentication requests.

    I noticed that softmac wasn't playing nice with this, as I couldn't make it try
    to connect to other networks after it had timed out authenticating to my ill
    router.

    To resolve this, I modified the softmac event/notify API to pass the event
    code to the callback, so that callbacks being notified from
    IEEE80211SOFTMAC_EVENT_ANY masks can make some judgement. In this case, the
    ieee80211softmac_assoc callback needs to make a decision based upon whether
    the association passed or failed.

    Signed-off-by: Daniel Drake
    Acked-by: Johannes Berg
    Signed-off-by: John W. Linville

    Daniel Drake
     
  • This patch finishes of the partially-complete shared key authentication
    implementation in softmac.

    The complication here is that we need to encrypt a management frame during
    the authentication process. I don't think there are any other scenarios where
    this would have to happen.

    To get around this without causing too many headaches, we decided to just use
    software encryption for this frame. The softmac config option now selects
    IEEE80211_CRYPT_WEP so that we can ensure this available. This also involved
    a modification to some otherwise unused ieee80211 API.

    Signed-off-by: Daniel Drake
    Acked-by: Johannes Berg
    Signed-off-by: John W. Linville

    Daniel Drake
     
  • John W. Linville
     

01 Jun, 2006

1 commit

  • From: Andrew Morton

    Move the forward decl outside the ifdef, since we use it in both legs.

    Should fix the spacr64 build error reported in
    http://bugzilla.kernel.org/show_bug.cgi?id=6625

    Acked-by: "David S. Miller"
    Cc: Cedric Pellerin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     

27 May, 2006

1 commit


24 May, 2006

1 commit


23 May, 2006

1 commit