fb: Reduce priority of resource conflict message

[karo-tx-linux.git] / drivers / net / xen-netfront.c

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index da1f121203466c10bc668f84d1f511486273e292..5c8d9c385be0f05ffedc1bdceab8cb090a8749c9 100644 (file)
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -122,7 +122,7 @@ struct netfront_info {
        struct mmu_update rx_mmu[NET_RX_RING_SIZE];
 
        /* Statistics */
-       int rx_gso_checksum_fixup;
+       unsigned long rx_gso_checksum_fixup;
 };
 
 struct netfront_rx_info {
@@ -359,7 +359,7 @@ static void xennet_tx_buf_gc(struct net_device *dev)
                        struct xen_netif_tx_response *txrsp;
 
                        txrsp = RING_GET_RESPONSE(&np->tx, cons);
-                       if (txrsp->status == NETIF_RSP_NULL)
+                       if (txrsp->status == XEN_NETIF_RSP_NULL)
                                continue;
 
                        id  = txrsp->id;
@@ -416,7 +416,7 @@ static void xennet_make_frags(struct sk_buff *skb, struct net_device *dev,
           larger than a page), split it it into page-sized chunks. */
        while (len > PAGE_SIZE - offset) {
                tx->size = PAGE_SIZE - offset;
-               tx->flags |= NETTXF_more_data;
+               tx->flags |= XEN_NETTXF_more_data;
                len -= tx->size;
                data += tx->size;
                offset = 0;
@@ -442,7 +442,7 @@ static void xennet_make_frags(struct sk_buff *skb, struct net_device *dev,
        for (i = 0; i < frags; i++) {
                skb_frag_t *frag = skb_shinfo(skb)->frags + i;
 
-               tx->flags |= NETTXF_more_data;
+               tx->flags |= XEN_NETTXF_more_data;
 
                id = get_id_from_freelist(&np->tx_skb_freelist, np->tx_skbs);
                np->tx_skbs[id].skb = skb_get(skb);
@@ -517,10 +517,10 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
        tx->flags = 0;
        if (skb->ip_summed == CHECKSUM_PARTIAL)
                /* local packet? */
-               tx->flags |= NETTXF_csum_blank | NETTXF_data_validated;
+               tx->flags |= XEN_NETTXF_csum_blank | XEN_NETTXF_data_validated;
        else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
                /* remote but checksummed. */
-               tx->flags |= NETTXF_data_validated;
+               tx->flags |= XEN_NETTXF_data_validated;
 
        if (skb_shinfo(skb)->gso_size) {
                struct xen_netif_extra_info *gso;
@@ -531,7 +531,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
                if (extra)
                        extra->flags |= XEN_NETIF_EXTRA_FLAG_MORE;
                else
-                       tx->flags |= NETTXF_extra_info;
+                       tx->flags |= XEN_NETTXF_extra_info;
 
                gso->u.gso.size = skb_shinfo(skb)->gso_size;
                gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
@@ -651,7 +651,7 @@ static int xennet_get_responses(struct netfront_info *np,
        int err = 0;
        unsigned long ret;
 
-       if (rx->flags & NETRXF_extra_info) {
+       if (rx->flags & XEN_NETRXF_extra_info) {
                err = xennet_get_extras(np, extras, rp);
                cons = np->rx.rsp_cons;
        }
@@ -688,7 +688,7 @@ static int xennet_get_responses(struct netfront_info *np,
                __skb_queue_tail(list, skb);
 
 next:
-               if (!(rx->flags & NETRXF_more_data))
+               if (!(rx->flags & XEN_NETRXF_more_data))
                        break;
 
                if (cons + frags == rp) {
@@ -983,9 +983,9 @@ err:
                skb->truesize += skb->data_len - (RX_COPY_THRESHOLD - len);
                skb->len += skb->data_len;
 
-               if (rx->flags & NETRXF_csum_blank)
+               if (rx->flags & XEN_NETRXF_csum_blank)
                        skb->ip_summed = CHECKSUM_PARTIAL;
-               else if (rx->flags & NETRXF_data_validated)
+               else if (rx->flags & XEN_NETRXF_data_validated)
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                __skb_queue_tail(&rxq, skb);
@@ -1692,7 +1692,7 @@ static void xennet_get_ethtool_stats(struct net_device *dev,
        int i;
 
        for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
-               data[i] = *(int *)(np + xennet_stats[i].offset);
+               data[i] = *(unsigned long *)(np + xennet_stats[i].offset);
 }
 
 static void xennet_get_strings(struct net_device *dev, u32 stringset, u8 * data)