aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorChristian Limpach <Christian.Limpach@xensource.com>2007-01-18 15:18:07 +0000
committerChristian Limpach <Christian.Limpach@xensource.com>2007-01-18 15:18:07 +0000
commit361f8004cbabe9cdb5386cf2c838b5c732feb53a (patch)
treeeb750c49a92fb22f728eb6014ea778046309720b /patches
parent10c910a7b561e6df8f8f0118ad61804d8d102973 (diff)
parent71c1836f5c613d4a97dad47de25bdf844f3f0e1d (diff)
downloadxen-361f8004cbabe9cdb5386cf2c838b5c732feb53a.tar.gz
xen-361f8004cbabe9cdb5386cf2c838b5c732feb53a.tar.bz2
xen-361f8004cbabe9cdb5386cf2c838b5c732feb53a.zip
[merge] with xen-unstable
Diffstat (limited to 'patches')
-rw-r--r--patches/linux-2.6.18/ipv6-no-autoconf.patch19
-rw-r--r--patches/linux-2.6.18/series1
2 files changed, 0 insertions, 20 deletions
diff --git a/patches/linux-2.6.18/ipv6-no-autoconf.patch b/patches/linux-2.6.18/ipv6-no-autoconf.patch
deleted file mode 100644
index 84c72e956b..0000000000
--- a/patches/linux-2.6.18/ipv6-no-autoconf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -pruN ../orig-linux-2.6.18/net/ipv6/addrconf.c ./net/ipv6/addrconf.c
---- ../orig-linux-2.6.18/net/ipv6/addrconf.c 2006-09-20 04:42:06.000000000 +0100
-+++ ./net/ipv6/addrconf.c 2007-01-12 16:08:07.000000000 +0000
-@@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in
- spin_lock_bh(&ifp->lock);
-
- if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
-+ !(dev->flags&IFF_MULTICAST) ||
- !(ifp->flags&IFA_F_TENTATIVE)) {
- ifp->flags &= ~IFA_F_TENTATIVE;
- spin_unlock_bh(&ifp->lock);
-@@ -2598,6 +2599,7 @@ static void addrconf_dad_completed(struc
- if (ifp->idev->cnf.forwarding == 0 &&
- ifp->idev->cnf.rtr_solicits > 0 &&
- (dev->flags&IFF_LOOPBACK) == 0 &&
-+ (dev->flags & IFF_MULTICAST) &&
- (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
- struct in6_addr all_routers;
-
diff --git a/patches/linux-2.6.18/series b/patches/linux-2.6.18/series
index 8917c01dfb..9a007ac3ab 100644
--- a/patches/linux-2.6.18/series
+++ b/patches/linux-2.6.18/series
@@ -5,7 +5,6 @@ linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
blktap-aio-16_03_06.patch
fix-ide-cd-pio-mode.patch
i386-mach-io-check-nmi.patch
-ipv6-no-autoconf.patch
net-csum.patch
net-gso-5-rcv-mss.patch
net-gso-6-linear-segmentation.patch