~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to net/ipv6/addrconf.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-19.30
  • Date: 2012-11-16 10:39:59 UTC
  • mfrom: (70.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20121116103959-vtq57nkpwttzzo3o
Tags: 3.5.0-215.22
* Release Tracking Bug
  - LP: #1078672

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-19.30

[ Ubuntu: 3.5.0-19.30 ]

* Release Tracking Bug
  - LP: #1078041
* [Config] update Vcs-git: to point to quantal
  - LP: #1069204
* SAUCE: ALSA: hda - add quirk for Thinkpad T430
  - LP: #1060372
* [Config] CONFIG_USB_OTG=n for all but armel/armhf
  - LP: #1047527
* [Config] remove ndiswrapper from Provides:
  - LP: #1076395
* [Config] ONFIG_AMD_IOMMU_V2=m
  - LP: #1071520
* kernel/sys.c: fix stack memory content leak via UNAME26
  - LP: #1065622, #1060521
  - CVE-2012-0957
* use clamp_t in UNAME26 fix
  - LP: #1065622, #1060521
  - CVE-2012-0957
* net: fix divide by zero in tcp algorithm illinois
  - LP: #1077091
  - CVE-2012-4565
* SAUCE: Bluetooth: Add a load_firmware callback to struct hci_dev
  - LP: #1065400
* SAUCE: Bluetooth: Implement broadcom patchram firmware loader
  - LP: #1065400
* SAUCE: Bluetooth: Add support for 13d3:3388 and 13d3:3389
  - LP: #1065400

Show diffs side-by-side

added added

removed removed

Lines of Context:
793
793
                struct in6_addr prefix;
794
794
                struct rt6_info *rt;
795
795
                struct net *net = dev_net(ifp->idev->dev);
 
796
                struct flowi6 fl6 = {};
 
797
 
796
798
                ipv6_addr_prefix(&prefix, &ifp->addr, ifp->prefix_len);
797
 
                rt = rt6_lookup(net, &prefix, NULL, ifp->idev->dev->ifindex, 1);
 
799
                fl6.flowi6_oif = ifp->idev->dev->ifindex;
 
800
                fl6.daddr = prefix;
 
801
                rt = (struct rt6_info *)ip6_route_lookup(net, &fl6,
 
802
                                                         RT6_LOOKUP_F_IFACE);
798
803
 
799
 
                if (rt && addrconf_is_prefix_route(rt)) {
 
804
                if (rt != net->ipv6.ip6_null_entry &&
 
805
                    addrconf_is_prefix_route(rt)) {
800
806
                        if (onlink == 0) {
801
807
                                ip6_del_rt(rt);
802
808
                                rt = NULL;