Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[~andy/linux] / drivers / net / ethernet / atheros / alx / alx.h

diff --git a/drivers/net/ethernet/atheros/alx/alx.h b/drivers/net/ethernet/atheros/alx/alx.h
index 50b3ae2b143d82db718359467320f61a9e20ec66..8fc93c5f6abca337e01f6939678cadd24f36b0f1 100644 (file)
--- a/drivers/net/ethernet/atheros/alx/alx.h
+++ b/drivers/net/ethernet/atheros/alx/alx.h
@@ -85,16 +85,16 @@ struct alx_priv {
        struct {
                dma_addr_t dma;
                void *virt;
-               int size;
+               unsigned int size;
        } descmem;
 
        /* protect int_mask updates */
        spinlock_t irq_lock;
        u32 int_mask;
 
-       int tx_ringsz;
-       int rx_ringsz;
-       int rxbuf_size;
+       unsigned int tx_ringsz;
+       unsigned int rx_ringsz;
+       unsigned int rxbuf_size;
 
        struct napi_struct napi;
        struct alx_tx_queue txq;
@@ -106,6 +106,9 @@ struct alx_priv {
        u16 msg_enable;
 
        bool msi;
+
+       /* protects hw.stats */
+       spinlock_t stats_lock;
 };
 
 extern const struct ethtool_ops alx_ethtool_ops;