ia64/xen-unstable

changeset 10104:a5ef851c217b

[NET] front: remove use of typedefs for structures.
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
author kaf24@firebug.cl.cam.ac.uk
date Fri May 19 15:51:26 2006 +0100 (2006-05-19)
parents 093f8d333568
children 167790b102ac
files linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri May 19 15:51:06 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri May 19 15:51:26 2006 +0100
     1.3 @@ -64,8 +64,8 @@
     1.4  
     1.5  #define GRANT_INVALID_REF	0
     1.6  
     1.7 -#define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE)
     1.8 -#define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE)
     1.9 +#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE)
    1.10 +#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE)
    1.11  
    1.12  static inline void init_skb_shinfo(struct sk_buff *skb)
    1.13  {
    1.14 @@ -80,8 +80,8 @@ struct netfront_info {
    1.15  
    1.16  	struct net_device_stats stats;
    1.17  
    1.18 -	netif_tx_front_ring_t tx;
    1.19 -	netif_rx_front_ring_t rx;
    1.20 +	struct netif_tx_front_ring tx;
    1.21 +	struct netif_rx_front_ring rx;
    1.22  
    1.23  	spinlock_t   tx_lock;
    1.24  	spinlock_t   rx_lock;
    1.25 @@ -123,8 +123,8 @@ struct netfront_info {
    1.26  	u8 mac[ETH_ALEN];
    1.27  
    1.28  	unsigned long rx_pfn_array[NET_RX_RING_SIZE];
    1.29 -	multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1];
    1.30 -	mmu_update_t rx_mmu[NET_RX_RING_SIZE];
    1.31 +	struct multicall_entry rx_mcl[NET_RX_RING_SIZE+1];
    1.32 +	struct mmu_update rx_mmu[NET_RX_RING_SIZE];
    1.33  };
    1.34  
    1.35  /*
    1.36 @@ -317,8 +317,8 @@ again:
    1.37  
    1.38  static int setup_device(struct xenbus_device *dev, struct netfront_info *info)
    1.39  {
    1.40 -	netif_tx_sring_t *txs;
    1.41 -	netif_rx_sring_t *rxs;
    1.42 +	struct netif_tx_sring *txs;
    1.43 +	struct netif_rx_sring *rxs;
    1.44  	int err;
    1.45  	struct net_device *netdev = info->netdev;
    1.46  
    1.47 @@ -328,13 +328,13 @@ static int setup_device(struct xenbus_de
    1.48  	info->tx.sring = NULL;
    1.49  	info->irq = 0;
    1.50  
    1.51 -	txs = (netif_tx_sring_t *)__get_free_page(GFP_KERNEL);
    1.52 +	txs = (struct netif_tx_sring *)__get_free_page(GFP_KERNEL);
    1.53  	if (!txs) {
    1.54  		err = -ENOMEM;
    1.55  		xenbus_dev_fatal(dev, err, "allocating tx ring page");
    1.56  		goto fail;
    1.57  	}
    1.58 -	rxs = (netif_rx_sring_t *)__get_free_page(GFP_KERNEL);
    1.59 +	rxs = (struct netif_rx_sring *)__get_free_page(GFP_KERNEL);
    1.60  	if (!rxs) {
    1.61  		err = -ENOMEM;
    1.62  		xenbus_dev_fatal(dev, err, "allocating rx ring page");
    1.63 @@ -638,7 +638,7 @@ static int network_start_xmit(struct sk_
    1.64  {
    1.65  	unsigned short id;
    1.66  	struct netfront_info *np = netdev_priv(dev);
    1.67 -	netif_tx_request_t *tx;
    1.68 +	struct netif_tx_request *tx;
    1.69  	RING_IDX i;
    1.70  	grant_ref_t ref;
    1.71  	unsigned long mfn;
    1.72 @@ -736,10 +736,10 @@ static int netif_poll(struct net_device 
    1.73  {
    1.74  	struct netfront_info *np = netdev_priv(dev);
    1.75  	struct sk_buff *skb, *nskb;
    1.76 -	netif_rx_response_t *rx;
    1.77 +	struct netif_rx_response *rx;
    1.78  	RING_IDX i, rp;
    1.79 -	mmu_update_t *mmu = np->rx_mmu;
    1.80 -	multicall_entry_t *mcl = np->rx_mcl;
    1.81 +	struct mmu_update *mmu = np->rx_mmu;
    1.82 +	struct multicall_entry *mcl = np->rx_mcl;
    1.83  	int work_done, budget, more_to_do = 1;
    1.84  	struct sk_buff_head rxq;
    1.85  	unsigned long flags;
    1.86 @@ -962,7 +962,7 @@ static void network_connect(struct net_d
    1.87  {
    1.88  	struct netfront_info *np;
    1.89  	int i, requeue_idx;
    1.90 -	netif_tx_request_t *tx;
    1.91 +	struct netif_tx_request *tx;
    1.92  	struct sk_buff *skb;
    1.93  
    1.94  	np = netdev_priv(dev);