1. 05 3月, 2011 21 次提交
  2. 15 2月, 2011 1 次提交
  3. 12 2月, 2011 3 次提交
  4. 11 2月, 2011 1 次提交
    • S
      batman-adv: Use successive sequence numbers for fragments · c2f7f0e7
      Sven Eckelmann 提交于
      The two fragments of an unicast packet must have successive sequence numbers to
      allow the receiver side to detect matching fragments and merge them again. The
      current implementation doesn't provide that property because a sequence of two
      atomic_inc_return may be interleaved with another sequence which also changes
      the variable.
      
      The access to the fragment sequence number pool has either to be protected by
      correct locking or it has to reserve two sequence numbers in a single fetch.
      The latter one can easily be done by increasing the value of the last used
      sequence number by 2 in a single step. The generated window of two currently
      unused sequence numbers can now be scattered across the two fragments.
      Reported-by: NLinus Lüssing <linus.luessing@web.de>
      Signed-off-by: NSven Eckelmann <sven@narfation.org>
      c2f7f0e7
  5. 31 1月, 2011 9 次提交
  6. 22 1月, 2011 5 次提交
    • L
      Linux 2.6.38-rc2 · 1bae4ce2
      Linus Torvalds 提交于
      1bae4ce2
    • L
      Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 13a3cec8
      Linus Torvalds 提交于
      * 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (101 commits)
        [media] staging/lirc: fix mem leaks and ptr err usage
        [media] hdpvr: reduce latency of i2c read/write w/recycled buffer
        [media] hdpvr: enable IR part
        [media] rc/mceusb: timeout should be in ns, not us
        [media] v4l2-device: fix 'use-after-freed' oops
        [media] v4l2-dev: don't memset video_device.dev
        [media] zoran: use video_device_alloc instead of kmalloc
        [media] w9966: zero device state after a detach
        [media] v4l: Fix a use-before-set in the control framework
        [media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h
        [media] DocBook/v4l: update V4L2 revision and update copyright years
        [media] DocBook/v4l: fix validation error in dev-rds.xml
        [media] v4l2-ctrls: queryctrl shouldn't attempt to replace V4L2_CID_PRIVATE_BASE IDs
        [media] v4l2-ctrls: fix missing 'read-only' check
        [media] pvrusb2: Provide more information about IR units to lirc_zilog and ir-kbd-i2c
        [media] ir-kbd-i2c: Add back defaults setting for Zilog Z8's at addr 0x71
        [media] lirc_zilog: Update TODO.lirc_zilog
        [media] lirc_zilog: Add Andy Walls to copyright notice and authors list
        [media] lirc_zilog: Remove useless struct i2c_driver.command function
        [media] lirc_zilog: Remove unneeded tests for existence of the IR Tx function
        ...
      13a3cec8
    • D
      KEYS: Fix up comments in key management code · 973c9f4f
      David Howells 提交于
      Fix up comments in the key management code.  No functional changes.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      973c9f4f
    • D
      KEYS: Do some style cleanup in the key management code. · a8b17ed0
      David Howells 提交于
      Do a bit of a style clean up in the key management code.  No functional
      changes.
      
      Done using:
      
        perl -p -i -e 's!^/[*]*/\n!!' security/keys/*.c
        perl -p -i -e 's!} /[*] end [a-z0-9_]*[(][)] [*]/\n!}\n!' security/keys/*.c
        sed -i -s -e ": next" -e N -e 's/^\n[}]$/}/' -e t -e P -e 's/^.*\n//' -e "b next" security/keys/*.c
      
      To remove /*****/ lines, remove comments on the closing brace of a
      function to name the function and remove blank lines before the closing
      brace of a function.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a8b17ed0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 9093ba53
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: fix up CIFSSMBEcho for unaligned access
        cifs: fix unaligned accesses in cifsConvertToUCS
        cifs: clean up unaligned accesses in cifs_unicode.c
        cifs: fix unaligned access in check2ndT2 and coalesce_t2
        cifs: clean up unaligned accesses in validate_t2
        cifs: use get/put_unaligned functions to access ByteCount
        cifs: move time field in cifsInodeInfo
        cifs: TCP_Server_Info diet
        CIFS: Implement cifs_strict_readv (try #4)
        CIFS: Implement cifs_file_strict_mmap (try #2)
        CIFS: Implement cifs_strict_fsync
        CIFS: Make cifsFileInfo_put work with strict cache mode
      9093ba53