Commit 23639126 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Greg Kroah-Hartman

Staging: otus: fix assignment makes integer from pointer without a cast warnings

This patch fixes some %x pointer printing to %p.

It also uses the skb_tail_pointer and skb_mac_header macros for accessing
thos members.
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ab59186c
...@@ -829,7 +829,7 @@ int zfLnxRegisterVapDev(struct net_device* parentDev, u16_t vapId) ...@@ -829,7 +829,7 @@ int zfLnxRegisterVapDev(struct net_device* parentDev, u16_t vapId)
{ {
/* Allocate net device structure */ /* Allocate net device structure */
vap[vapId].dev = alloc_etherdev(0); vap[vapId].dev = alloc_etherdev(0);
printk("Register vap dev=%x\n", (u32_t)vap[vapId].dev); printk("Register vap dev=%p\n", vap[vapId].dev);
if(vap[vapId].dev == NULL) { if(vap[vapId].dev == NULL) {
printk("alloc_etherdev fail\n"); printk("alloc_etherdev fail\n");
...@@ -883,7 +883,7 @@ int zfLnxUnregisterVapDev(struct net_device* parentDev, u16_t vapId) ...@@ -883,7 +883,7 @@ int zfLnxUnregisterVapDev(struct net_device* parentDev, u16_t vapId)
printk("Unregister VAP dev : %s\n", vap[vapId].dev->name); printk("Unregister VAP dev : %s\n", vap[vapId].dev->name);
if(vap[vapId].dev != NULL) { if(vap[vapId].dev != NULL) {
printk("Unregister vap dev=%x\n", (u32_t)vap[vapId].dev); printk("Unregister vap dev=%p\n", vap[vapId].dev);
// //
//unregister_netdevice(wds[wdsId].dev); //unregister_netdevice(wds[wdsId].dev);
unregister_netdev(vap[vapId].dev); unregister_netdev(vap[vapId].dev);
......
...@@ -58,7 +58,7 @@ void zfLnxRecv80211(zdev_t *dev, zbuf_t *buf, struct zsAdditionInfo *addInfo) ...@@ -58,7 +58,7 @@ void zfLnxRecv80211(zdev_t *dev, zbuf_t *buf, struct zsAdditionInfo *addInfo)
skb1 = skb_copy(buf, GFP_ATOMIC); skb1 = skb_copy(buf, GFP_ATOMIC);
if (skb1 != NULL) { if (skb1 != NULL) {
skb1->dev = dev; skb1->dev = dev;
skb1->mac_header = skb1->data; skb_reset_mac_header(skb1);
skb1->ip_summed = CHECKSUM_NONE; skb1->ip_summed = CHECKSUM_NONE;
skb1->pkt_type = PACKET_OTHERHOST; skb1->pkt_type = PACKET_OTHERHOST;
/* ETH_P_80211_RAW */ /* ETH_P_80211_RAW */
...@@ -85,13 +85,7 @@ void zfLnxRecvEth(zdev_t *dev, zbuf_t *buf, u16_t port) ...@@ -85,13 +85,7 @@ void zfLnxRecvEth(zdev_t *dev, zbuf_t *buf, u16_t port)
/* new_buf = dev_alloc_skb(2048); */ /* new_buf = dev_alloc_skb(2048); */
new_buf = dev_alloc_skb(buf->len); new_buf = dev_alloc_skb(buf->len);
#ifdef NET_SKBUFF_DATA_USES_OFFSET skb_reset_tail_pointer(new_buf);
new_buf->tail = 0;
new_buf->len = 0;
#else
new_buf->tail = new_buf->data;
new_buf->len = 0;
#endif
skb_put(new_buf, buf->len); skb_put(new_buf, buf->len);
memcpy(new_buf->data, buf->data, buf->len); memcpy(new_buf->data, buf->data, buf->len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment