linux/generic: update 2.6.36 kernel patches

SVN-Revision: 22844
This commit is contained in:
Alexandros C. Couloumbis 2010-08-30 08:58:50 +00:00
parent 0e00670962
commit a3b66e1ea1
1 changed files with 3 additions and 3 deletions

View File

@ -1016,8 +1016,8 @@
+ t = &exp->tuple; + t = &exp->tuple;
+ t->dst.u3.ip = newip; + t->dst.u3.ip = newip;
+ +
+ extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip)) + extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", &extip)
+ : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip)); + : sprintf(szextaddr, "%u.%u.%u.%u", &newip);
+ DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto")); + DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
+ +
+ rbuf1len = rbufalen = 0; + rbuf1len = rbufalen = 0;
@ -1319,7 +1319,7 @@
+ newip = newdstip; + newip = newdstip;
+ +
+ DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n", + DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
+ NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip)); + &newsrcip, &newdstip, &newip);
+ +
+ mr.rangesize = 1; + mr.rangesize = 1;
+ // We don't want to manip the per-protocol, just the IPs. + // We don't want to manip the per-protocol, just the IPs.