rpms/kernel/F-7 linux-2.6-ps3-gelic.patch,1.3,1.4

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12408

Modified Files:
	linux-2.6-ps3-gelic.patch 
Log Message:
build fix for .22 API changes

linux-2.6-ps3-gelic.patch:

Index: linux-2.6-ps3-gelic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-ps3-gelic.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-ps3-gelic.patch	12 Jul 2007 21:31:10 -0000	1.3
+++ linux-2.6-ps3-gelic.patch	12 Jul 2007 22:35:52 -0000	1.4
@@ -1962,3 +1962,18 @@
 +}
 +early_param("gelic_vlan", early_param_gelic_net);
 +#endif
+--- linux-2.6.22.noarch/drivers/net/gelic_net.c~	2007-07-12 18:34:54.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/gelic_net.c	2007-07-12 18:35:08.000000000 -0400
+@@ -682,9 +682,10 @@ gelic_net_set_txdescr_cmdstat(struct gel
+ 		/* is packet ip?
+ 		 * if yes: tcp? udp? */
+ 		if (skb->protocol == htons(ETH_P_IP)) {
+-			if (skb->nh.iph->protocol == IPPROTO_TCP) {
++			const struct iphdr *iph = ip_hdr(skb);
++			if (ip->protocol == IPPROTO_TCP) {
+ 				descr->dmac_cmd_status = tcpcs;
+-			} else if (skb->nh.iph->protocol == IPPROTO_UDP) {
++			} else if (ip->protocol == IPPROTO_UDP) {
+ 				descr->dmac_cmd_status = udpcs;
+ 			} else { /* the stack should checksum non-tcp and non-udp
+ 				    packets on his own: NETIF_F_IP_CSUM */