drivers/char/agp/intel-agp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---- linux-2.6.18.3.orig/drivers/char/agp/generic.c
-+++ linux-2.6.18.3/drivers/char/agp/generic.c
+--- linux-2.6.18.4.orig/drivers/char/agp/generic.c
++++ linux-2.6.18.4/drivers/char/agp/generic.c
@@ -1042,7 +1042,7 @@ void *agp_generic_alloc_page(struct agp_
{
struct page * page;
if (page == NULL)
return NULL;
---- linux-2.6.18.3.orig/drivers/char/agp/intel-agp.c
-+++ linux-2.6.18.3/drivers/char/agp/intel-agp.c
+--- linux-2.6.18.4.orig/drivers/char/agp/intel-agp.c
++++ linux-2.6.18.4/drivers/char/agp/intel-agp.c
@@ -160,7 +160,7 @@ static void *i8xx_alloc_pages(void)
{
struct page * page;
arch/alpha/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- linux-2.6.18.3.orig/arch/alpha/Kconfig
-+++ linux-2.6.18.3/arch/alpha/Kconfig
+--- linux-2.6.18.4.orig/arch/alpha/Kconfig
++++ linux-2.6.18.4/arch/alpha/Kconfig
@@ -381,7 +381,7 @@ config ALPHA_EV56
config ALPHA_EV56
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
---- linux-2.6.18.3.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
-+++ linux-2.6.18.3/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+--- linux-2.6.18.4.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
++++ linux-2.6.18.4/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -1463,6 +1463,23 @@ static void handle_irq_transmit_status(s
}
}
net/bluetooth/hci_sock.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---- linux-2.6.18.3.orig/net/bluetooth/hci_sock.c
-+++ linux-2.6.18.3/net/bluetooth/hci_sock.c
+--- linux-2.6.18.4.orig/net/bluetooth/hci_sock.c
++++ linux-2.6.18.4/net/bluetooth/hci_sock.c
@@ -120,10 +120,13 @@ void hci_send_to_sock(struct hci_dev *hd
if (!hci_test_bit(evt, &flt->event_mask))
continue;
arch/ia64/sn/kernel/bte.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
---- linux-2.6.18.3.orig/arch/ia64/sn/kernel/bte.c
-+++ linux-2.6.18.3/arch/ia64/sn/kernel/bte.c
+--- linux-2.6.18.4.orig/arch/ia64/sn/kernel/bte.c
++++ linux-2.6.18.4/arch/ia64/sn/kernel/bte.c
@@ -382,14 +382,13 @@ bte_result_t bte_unaligned_copy(u64 src,
* bcopy to the destination.
*/
fs/fuse/dir.c | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 14 deletions(-)
---- linux-2.6.18.3.orig/fs/fuse/dir.c
-+++ linux-2.6.18.3/fs/fuse/dir.c
+--- linux-2.6.18.4.orig/fs/fuse/dir.c
++++ linux-2.6.18.4/fs/fuse/dir.c
@@ -138,6 +138,7 @@ static int fuse_dentry_revalidate(struct
struct fuse_entry_out outarg;
struct fuse_conn *fc;
net/ipv6/udp.c | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
---- linux-2.6.18.3.orig/net/dccp/ipv6.c
-+++ linux-2.6.18.3/net/dccp/ipv6.c
+--- linux-2.6.18.4.orig/net/dccp/ipv6.c
++++ linux-2.6.18.4/net/dccp/ipv6.c
@@ -276,7 +276,7 @@ static void dccp_v6_err(struct sk_buff *
__u64 seq;
if (sk == NULL) {
ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS);
---- linux-2.6.18.3.orig/net/ipv6/udp.c
-+++ linux-2.6.18.3/net/ipv6/udp.c
+--- linux-2.6.18.4.orig/net/ipv6/udp.c
++++ linux-2.6.18.4/net/ipv6/udp.c
@@ -314,14 +314,13 @@ static void udpv6_err(struct sk_buff *sk
{
struct ipv6_pinfo *np;
net/ipv4/netfilter/arp_tables.c | 2 ++
1 file changed, 2 insertions(+)
---- linux-2.6.18.3.orig/net/ipv4/netfilter/arp_tables.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/arp_tables.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/arp_tables.c
++++ linux-2.6.18.4/net/ipv4/netfilter/arp_tables.c
@@ -1211,6 +1211,8 @@ err1:
static void __exit arp_tables_fini(void)
{
net/ipv4/netfilter/ip_conntrack_helper_h323.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/ip_conntrack_helper_h323.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c
++++ linux-2.6.18.4/net/ipv4/netfilter/ip_conntrack_helper_h323.c
@@ -1417,7 +1417,7 @@ static int process_rcf(struct sk_buff **
DEBUGP
("ip_ct_ras: set RAS connection timeout to %u seconds\n",
net/ipv4/netfilter/iptable_mangle.c | 3 ++-
5 files changed, 21 insertions(+), 6 deletions(-)
---- linux-2.6.18.3.orig/include/linux/netfilter_ipv4.h
-+++ linux-2.6.18.3/include/linux/netfilter_ipv4.h
+--- linux-2.6.18.4.orig/include/linux/netfilter_ipv4.h
++++ linux-2.6.18.4/include/linux/netfilter_ipv4.h
@@ -77,7 +77,7 @@ enum nf_ip_hook_priorities {
#define SO_ORIGINAL_DST 80
extern int ip_xfrm_me_harder(struct sk_buff **pskb);
extern unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
unsigned int dataoff, u_int8_t protocol);
---- linux-2.6.18.3.orig/net/ipv4/ipvs/ip_vs_core.c
-+++ linux-2.6.18.3/net/ipv4/ipvs/ip_vs_core.c
+--- linux-2.6.18.4.orig/net/ipv4/ipvs/ip_vs_core.c
++++ linux-2.6.18.4/net/ipv4/ipvs/ip_vs_core.c
@@ -813,6 +813,16 @@ ip_vs_out(unsigned int hooknum, struct s
skb->nh.iph->saddr = cp->vaddr;
ip_send_check(skb->nh.iph);
IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT");
ip_vs_out_stats(cp, skb);
---- linux-2.6.18.3.orig/net/ipv4/netfilter.c
-+++ linux-2.6.18.3/net/ipv4/netfilter.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter.c
++++ linux-2.6.18.4/net/ipv4/netfilter.c
@@ -8,7 +8,7 @@
#include <net/ip.h>
}
return 0;
}
---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_nat_standalone.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/ip_nat_standalone.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_nat_standalone.c
++++ linux-2.6.18.4/net/ipv4/netfilter/ip_nat_standalone.c
@@ -275,7 +275,8 @@ ip_nat_local_fn(unsigned int hooknum,
ct->tuplehash[!dir].tuple.src.u.all
#endif
}
return ret;
}
---- linux-2.6.18.3.orig/net/ipv4/netfilter/iptable_mangle.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/iptable_mangle.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/iptable_mangle.c
++++ linux-2.6.18.4/net/ipv4/netfilter/iptable_mangle.c
@@ -157,7 +157,8 @@ ipt_local_hook(unsigned int hook,
|| (*pskb)->nfmark != nfmark
#endif
net/ipv4/netfilter/ip_tables.c | 1 +
1 file changed, 1 insertion(+)
---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c
++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c
@@ -1775,6 +1775,7 @@ free_newinfo:
out:
return ret;
net/ipv4/netfilter/ip_tables.c | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c
++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c
@@ -1537,7 +1537,7 @@ check_compat_entry_size_and_hooks(struct
ret = IPT_MATCH_ITERATE(e, compat_check_calc_match, name, &e->ip,
e->comefrom, &off, &j);
net/netfilter/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- linux-2.6.18.3.orig/net/netfilter/Kconfig
-+++ linux-2.6.18.3/net/netfilter/Kconfig
+--- linux-2.6.18.4.orig/net/netfilter/Kconfig
++++ linux-2.6.18.4/net/netfilter/Kconfig
@@ -342,7 +342,7 @@ config NETFILTER_XT_MATCH_MULTIPORT
config NETFILTER_XT_MATCH_PHYSDEV
net/ipv6/netfilter/ip6_tables.c | 53 ++++++++++++++------------------
3 files changed, 77 insertions(+), 78 deletions(-)
---- linux-2.6.18.3.orig/net/ipv4/netfilter/arp_tables.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/arp_tables.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/arp_tables.c
++++ linux-2.6.18.4/net/ipv4/netfilter/arp_tables.c
@@ -380,6 +380,13 @@ static int mark_source_chains(struct xt_
&& unconditional(&e->arp)) {
unsigned int oldpos, size;
return ret;
}
---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c
++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c
@@ -404,6 +404,13 @@ mark_source_chains(struct xt_table_info
&& unconditional(&e->ip)) {
unsigned int oldpos, size;
err:
return ret;
}
---- linux-2.6.18.3.orig/net/ipv6/netfilter/ip6_tables.c
-+++ linux-2.6.18.3/net/ipv6/netfilter/ip6_tables.c
+--- linux-2.6.18.4.orig/net/ipv6/netfilter/ip6_tables.c
++++ linux-2.6.18.4/net/ipv6/netfilter/ip6_tables.c
@@ -444,6 +444,13 @@ mark_source_chains(struct xt_table_info
&& unconditional(&e->ipv6)) {
unsigned int oldpos, size;
net/ipv4/netfilter/ip_tables.c | 3 +++
1 file changed, 3 insertions(+)
---- linux-2.6.18.3.orig/net/ipv4/netfilter/ip_tables.c
-+++ linux-2.6.18.3/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.18.4.orig/net/ipv4/netfilter/ip_tables.c
++++ linux-2.6.18.4/net/ipv4/netfilter/ip_tables.c
@@ -1994,6 +1994,9 @@ compat_do_ipt_get_ctl(struct sock *sk, i
{
int ret;
net/netfilter/Kconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---- linux-2.6.18.3.orig/net/netfilter/Kconfig
-+++ linux-2.6.18.3/net/netfilter/Kconfig
+--- linux-2.6.18.4.orig/net/netfilter/Kconfig
++++ linux-2.6.18.4/net/netfilter/Kconfig
@@ -197,7 +197,9 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_CONNSECMARK
drivers/pcmcia/ds.c | 5 +++++
1 file changed, 5 insertions(+)
---- linux-2.6.18.3.orig/drivers/pcmcia/ds.c
-+++ linux-2.6.18.3/drivers/pcmcia/ds.c
+--- linux-2.6.18.4.orig/drivers/pcmcia/ds.c
++++ linux-2.6.18.4/drivers/pcmcia/ds.c
@@ -1264,6 +1264,11 @@ static void pcmcia_bus_remove_socket(str
socket->pcmcia_state.dead = 1;
pccard_register_pcmcia(socket, NULL);
drivers/scsi/scsi_lib.c | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
---- linux-2.6.18.3.orig/block/scsi_ioctl.c
-+++ linux-2.6.18.3/block/scsi_ioctl.c
+--- linux-2.6.18.4.orig/block/scsi_ioctl.c
++++ linux-2.6.18.4/block/scsi_ioctl.c
@@ -286,9 +286,8 @@ static int sg_io(struct file *file, requ
* fill in request structure
*/
memset(sense, 0, sizeof(sense));
rq->sense = sense;
---- linux-2.6.18.3.orig/drivers/scsi/scsi_lib.c
-+++ linux-2.6.18.3/drivers/scsi/scsi_lib.c
+--- linux-2.6.18.4.orig/drivers/scsi/scsi_lib.c
++++ linux-2.6.18.4/drivers/scsi/scsi_lib.c
@@ -408,6 +408,7 @@ int scsi_execute_async(struct scsi_devic
goto free_req;
net/ieee80211/softmac/ieee80211softmac_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- linux-2.6.18.3.orig/net/ieee80211/softmac/ieee80211softmac_io.c
-+++ linux-2.6.18.3/net/ieee80211/softmac/ieee80211softmac_io.c
+--- linux-2.6.18.4.orig/net/ieee80211/softmac/ieee80211softmac_io.c
++++ linux-2.6.18.4/net/ieee80211/softmac/ieee80211softmac_io.c
@@ -304,7 +304,7 @@ ieee80211softmac_auth(struct ieee80211_a
2 + /* Auth Transaction Seq */
2 + /* Status Code */
drivers/net/tg3.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---- linux-2.6.18.3.orig/drivers/net/tg3.c
-+++ linux-2.6.18.3/drivers/net/tg3.c
+--- linux-2.6.18.4.orig/drivers/net/tg3.c
++++ linux-2.6.18.4/drivers/net/tg3.c
@@ -6889,8 +6889,10 @@ static int tg3_open(struct net_device *d
tg3_full_lock(tp, 0);
net/ipv4/udp.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
---- linux-2.6.18.3.orig/net/ipv4/udp.c
-+++ linux-2.6.18.3/net/ipv4/udp.c
+--- linux-2.6.18.4.orig/net/ipv4/udp.c
++++ linux-2.6.18.4/net/ipv4/udp.c
@@ -892,23 +892,32 @@ static int udp_encap_rcv(struct sock * s
return 1;
#else
drivers/media/Kconfig | 1 +
1 file changed, 1 insertion(+)
---- linux-2.6.18.3.orig/drivers/media/Kconfig
-+++ linux-2.6.18.3/drivers/media/Kconfig
+--- linux-2.6.18.4.orig/drivers/media/Kconfig
++++ linux-2.6.18.4/drivers/media/Kconfig
@@ -54,6 +54,7 @@ config VIDEO_V4L1_COMPAT
config VIDEO_V4L2
arch/i386/kernel/microcode.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
---- linux-2.6.18.3.orig/arch/i386/kernel/microcode.c
-+++ linux-2.6.18.3/arch/i386/kernel/microcode.c
+--- linux-2.6.18.4.orig/arch/i386/kernel/microcode.c
++++ linux-2.6.18.4/arch/i386/kernel/microcode.c
@@ -250,14 +250,14 @@ static int find_matching_ucodes (void)
}