diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/s2io.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 6d8e5c4cf858..86f1228c9fec 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -4267,11 +4267,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 4267 | txdp->Control_1 |= TXD_UFO_MSS(ufo_size); | 4267 | txdp->Control_1 |= TXD_UFO_MSS(ufo_size); |
| 4268 | txdp->Control_1 |= TXD_BUFFER0_SIZE(8); | 4268 | txdp->Control_1 |= TXD_BUFFER0_SIZE(8); |
| 4269 | #ifdef __BIG_ENDIAN | 4269 | #ifdef __BIG_ENDIAN |
| 4270 | /* both variants do cpu_to_be64(be32_to_cpu(...)) */ | ||
| 4270 | fifo->ufo_in_band_v[put_off] = | 4271 | fifo->ufo_in_band_v[put_off] = |
| 4271 | (u64)skb_shinfo(skb)->ip6_frag_id; | 4272 | (__force u64)skb_shinfo(skb)->ip6_frag_id; |
| 4272 | #else | 4273 | #else |
| 4273 | fifo->ufo_in_band_v[put_off] = | 4274 | fifo->ufo_in_band_v[put_off] = |
| 4274 | (u64)skb_shinfo(skb)->ip6_frag_id << 32; | 4275 | (__force u64)skb_shinfo(skb)->ip6_frag_id << 32; |
| 4275 | #endif | 4276 | #endif |
| 4276 | txdp->Host_Control = (unsigned long)fifo->ufo_in_band_v; | 4277 | txdp->Host_Control = (unsigned long)fifo->ufo_in_band_v; |
| 4277 | txdp->Buffer_Pointer = pci_map_single(sp->pdev, | 4278 | txdp->Buffer_Pointer = pci_map_single(sp->pdev, |
| @@ -7089,11 +7090,11 @@ static int s2io_add_isr(struct s2io_nic * sp) | |||
| 7089 | if(!(sp->msix_info[i].addr && | 7090 | if(!(sp->msix_info[i].addr && |
| 7090 | sp->msix_info[i].data)) { | 7091 | sp->msix_info[i].data)) { |
| 7091 | DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx " | 7092 | DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx " |
| 7092 | "Data:0x%lx\n",sp->desc[i], | 7093 | "Data:0x%llx\n",sp->desc[i], |
| 7093 | (unsigned long long) | 7094 | (unsigned long long) |
| 7094 | sp->msix_info[i].addr, | 7095 | sp->msix_info[i].addr, |
| 7095 | (unsigned long) | 7096 | (unsigned long long) |
| 7096 | ntohl(sp->msix_info[i].data)); | 7097 | sp->msix_info[i].data); |
| 7097 | } else { | 7098 | } else { |
| 7098 | msix_tx_cnt++; | 7099 | msix_tx_cnt++; |
| 7099 | } | 7100 | } |
| @@ -7107,11 +7108,11 @@ static int s2io_add_isr(struct s2io_nic * sp) | |||
| 7107 | if(!(sp->msix_info[i].addr && | 7108 | if(!(sp->msix_info[i].addr && |
| 7108 | sp->msix_info[i].data)) { | 7109 | sp->msix_info[i].data)) { |
| 7109 | DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx " | 7110 | DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx " |
| 7110 | "Data:0x%lx\n",sp->desc[i], | 7111 | "Data:0x%llx\n",sp->desc[i], |
| 7111 | (unsigned long long) | 7112 | (unsigned long long) |
| 7112 | sp->msix_info[i].addr, | 7113 | sp->msix_info[i].addr, |
| 7113 | (unsigned long) | 7114 | (unsigned long long) |
| 7114 | ntohl(sp->msix_info[i].data)); | 7115 | sp->msix_info[i].data); |
| 7115 | } else { | 7116 | } else { |
| 7116 | msix_rx_cnt++; | 7117 | msix_rx_cnt++; |
| 7117 | } | 7118 | } |