VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / net / tokenring / lanstreamer.c

diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 3eee454..dcf7f3e 100644 (file)
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -129,6 +129,11 @@
 
 #include "lanstreamer.h"
 
+#if (BITS_PER_LONG == 64)
+#error broken on 64-bit: stores pointer to rx_ring->buffer in 32-bit int
+#endif
+
+
 /* I've got to put some intelligence into the version number so that Peter and I know
  * which version of the code somebody has got. 
  * Version Number = a.b.c.d  where a.b.c is the level of code and d is the latest author.
@@ -441,7 +446,7 @@ static int streamer_reset(struct net_device *dev)
        __u8 *streamer_mmio;
        unsigned long t;
        unsigned int uaa_addr;
-       struct sk_buff *skb = 0;
+       struct sk_buff *skb = NULL;
        __u16 misr;
 
        streamer_priv = (struct streamer_private *) dev->priv;