← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to net/ipv6/addrconf.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv6/addrconf.c
718
718
        struct inet6_ifaddr *ifa, *ifn;
719
719
        struct inet6_dev *idev = ifp->idev;
720
720
        int state;
721
 
        int hash;
722
721
        int deleted = 0, onlink = 0;
723
722
        unsigned long expires = jiffies;
724
723
 
725
 
        hash = ipv6_addr_hash(&ifp->addr);
726
 
 
727
724
        spin_lock_bh(&ifp->state_lock);
728
725
        state = ifp->state;
729
726
        ifp->state = INET6_IFADDR_STATE_DEAD;
1087
1084
        case IPV6_SADDR_RULE_PRIVACY:
1088
1085
            {
1089
1086
                /* Rule 7: Prefer public address
1090
 
                 * Note: prefer temprary address if use_tempaddr >= 2
 
1087
                 * Note: prefer temporary address if use_tempaddr >= 2
1091
1088
                 */
1092
1089
                int preftmp = dst->prefs & (IPV6_PREFER_SRC_PUBLIC|IPV6_PREFER_SRC_TMP) ?
1093
1090
                                !!(dst->prefs & IPV6_PREFER_SRC_TMP) :
1971
1968
                                         *  to the stored lifetime since we'll
1972
1969
                                         *  be updating the timestamp below,
1973
1970
                                         *  else we'll set it back to the
1974
 
                                         *  minumum.
 
1971
                                         *  minimum.
1975
1972
                                         */
1976
1973
                                        if (prefered_lft != ifp->prefered_lft) {
1977
1974
                                                valid_lft = stored_lft;
4540
4537
 
4541
4538
        t = p->sysctl;
4542
4539
        p->sysctl = NULL;
4543
 
        unregister_sysctl_table(t->sysctl_header);
 
4540
        unregister_net_sysctl_table(t->sysctl_header);
4544
4541
        kfree(t->dev_name);
4545
4542
        kfree(t);
4546
4543
}