]> xenbits.xensource.com Git - xen.git/commitdiff
[NET] back: build fixes.
authorkfraser@dhcp93.uk.xensource.com <kfraser@dhcp93.uk.xensource.com>
Thu, 29 Jun 2006 18:33:53 +0000 (19:33 +0100)
committerkfraser@dhcp93.uk.xensource.com <kfraser@dhcp93.uk.xensource.com>
Thu, 29 Jun 2006 18:33:53 +0000 (19:33 +0100)
Signed-off-by: Keir Fraser <keir@xensource.com>
linux-2.6-xen-sparse/drivers/xen/netback/netback.c

index 191c293c0289305d9a8b4a6f4a56870e76c0511a..56dc73116776420a3fb3fddc383e1e9021411644 100644 (file)
@@ -698,7 +698,7 @@ static void net_tx_action(unsigned long unused)
        struct sk_buff *skb;
        netif_t *netif;
        netif_tx_request_t txreq;
-       struct netif_tx_extra extras[XEN_NETIF_EXTRA_TYPE_MAX - 1];
+       struct netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX - 1];
        u16 pending_idx;
        RING_IDX i;
        gnttab_map_grant_ref_t *mop;
@@ -816,7 +816,7 @@ static void net_tx_action(unsigned long unused)
                skb_reserve(skb, 16);
 
                if (extras[XEN_NETIF_EXTRA_TYPE_GSO - 1].type) {
-                       struct netif_tx_extra *gso;
+                       struct netif_extra_info *gso;
                        gso = &extras[XEN_NETIF_EXTRA_TYPE_GSO - 1];
 
                        if (gso->u.gso.type != XEN_NETIF_GSO_TCPV4) {
@@ -829,7 +829,7 @@ static void net_tx_action(unsigned long unused)
                        skb_shinfo(skb)->gso_size = gso->u.gso.size;
                        skb_shinfo(skb)->gso_segs = gso->u.gso.segs;
                        skb_shinfo(skb)->gso_type =
-                               SKB_GSP_TCPV4 | SKB_GSO_DOSGY;
+                               SKB_GSO_TCPV4 | SKB_GSO_DODGY;
                }
 
                gnttab_set_map_op(mop, MMAP_VADDR(pending_idx),