Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 3459feb8 编写于 作者: A Al Viro 提交者： Jeff Garzik
浏览文件
操作

s2io annotations 

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NJeff Garzik <jeff@garzik.org>
上级 3b86301f
隐藏空白更改
内联 并排
Showing with 9 addition and 8 deletion
drivers/net/s2io.c
浏览文件 @ 3459feb8
...@@ -4267,11 +4267,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -4267,11 +4267,12 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
txdp->Control_1 |= TXD_UFO_MSS(ufo_size); txdp->Control_1 |= TXD_UFO_MSS(ufo_size);
txdp->Control_1 |= TXD_BUFFER0_SIZE(8); txdp->Control_1 |= TXD_BUFFER0_SIZE(8);
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
/* both variants do cpu_to_be64(be32_to_cpu(...)) */
fifo->ufo_in_band_v[put_off] = fifo->ufo_in_band_v[put_off] =
(u64)skb_shinfo(skb)->ip6_frag_id; (__force u64)skb_shinfo(skb)->ip6_frag_id;
#else #else
fifo->ufo_in_band_v[put_off] = fifo->ufo_in_band_v[put_off] =
(u64)skb_shinfo(skb)->ip6_frag_id << 32; (__force u64)skb_shinfo(skb)->ip6_frag_id << 32;
#endif #endif
txdp->Host_Control = (unsigned long)fifo->ufo_in_band_v; txdp->Host_Control = (unsigned long)fifo->ufo_in_band_v;
txdp->Buffer_Pointer = pci_map_single(sp->pdev, txdp->Buffer_Pointer = pci_map_single(sp->pdev,
...@@ -7089,11 +7090,11 @@ static int s2io_add_isr(struct s2io_nic * sp) ...@@ -7089,11 +7090,11 @@ static int s2io_add_isr(struct s2io_nic * sp)
if(!(sp->msix_info[i].addr && if(!(sp->msix_info[i].addr &&
sp->msix_info[i].data)) { sp->msix_info[i].data)) {
DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx " DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
"Data:0x%lx\n",sp->desc[i], "Data:0x%llx\n",sp->desc[i],
(unsigned long long) (unsigned long long)
sp->msix_info[i].addr, sp->msix_info[i].addr,
(unsigned long) (unsigned long long)
ntohl(sp->msix_info[i].data)); sp->msix_info[i].data);
} else { } else {
msix_tx_cnt++; msix_tx_cnt++;
} }
...@@ -7107,11 +7108,11 @@ static int s2io_add_isr(struct s2io_nic * sp) ...@@ -7107,11 +7108,11 @@ static int s2io_add_isr(struct s2io_nic * sp)
if(!(sp->msix_info[i].addr && if(!(sp->msix_info[i].addr &&
sp->msix_info[i].data)) { sp->msix_info[i].data)) {
DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx " DBG_PRINT(ERR_DBG, "%s @ Addr:0x%llx "
"Data:0x%lx\n",sp->desc[i], "Data:0x%llx\n",sp->desc[i],
(unsigned long long) (unsigned long long)
sp->msix_info[i].addr, sp->msix_info[i].addr,
(unsigned long) (unsigned long long)
ntohl(sp->msix_info[i].data)); sp->msix_info[i].data);
} else { } else {
msix_rx_cnt++; msix_rx_cnt++;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或