ia64/xen-unstable

changeset 10604:7a11e60d2f42

[NET] back: build fixes.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@dhcp93.uk.xensource.com
date Thu Jun 29 19:33:53 2006 +0100 (2006-06-29)
parents de263308be3b
children 5e30ef3e541d
files linux-2.6-xen-sparse/drivers/xen/netback/netback.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Thu Jun 29 19:02:45 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Thu Jun 29 19:33:53 2006 +0100
     1.3 @@ -698,7 +698,7 @@ static void net_tx_action(unsigned long 
     1.4  	struct sk_buff *skb;
     1.5  	netif_t *netif;
     1.6  	netif_tx_request_t txreq;
     1.7 -	struct netif_tx_extra extras[XEN_NETIF_EXTRA_TYPE_MAX - 1];
     1.8 +	struct netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX - 1];
     1.9  	u16 pending_idx;
    1.10  	RING_IDX i;
    1.11  	gnttab_map_grant_ref_t *mop;
    1.12 @@ -816,7 +816,7 @@ static void net_tx_action(unsigned long 
    1.13  		skb_reserve(skb, 16);
    1.14  
    1.15  		if (extras[XEN_NETIF_EXTRA_TYPE_GSO - 1].type) {
    1.16 -			struct netif_tx_extra *gso;
    1.17 +			struct netif_extra_info *gso;
    1.18  			gso = &extras[XEN_NETIF_EXTRA_TYPE_GSO - 1];
    1.19  
    1.20  			if (gso->u.gso.type != XEN_NETIF_GSO_TCPV4) {
    1.21 @@ -829,7 +829,7 @@ static void net_tx_action(unsigned long 
    1.22  			skb_shinfo(skb)->gso_size = gso->u.gso.size;
    1.23  			skb_shinfo(skb)->gso_segs = gso->u.gso.segs;
    1.24  			skb_shinfo(skb)->gso_type =
    1.25 -				SKB_GSP_TCPV4 | SKB_GSO_DOSGY;
    1.26 +				SKB_GSO_TCPV4 | SKB_GSO_DODGY;
    1.27  		}
    1.28  
    1.29  		gnttab_set_map_op(mop, MMAP_VADDR(pending_idx),