git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
drivers
/
net
/
sk98lin
/
skge.c
diff --git
a/drivers/net/sk98lin/skge.c
b/drivers/net/sk98lin/skge.c
index
92d11b9
..
e0a9300
100644
(file)
--- a/
drivers/net/sk98lin/skge.c
+++ b/
drivers/net/sk98lin/skge.c
@@
-1562,10
+1562,10
@@
struct sk_buff *pMessage) /* pointer to send-message */
pTxd->pMBuf = pMessage;
if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
pTxd->pMBuf = pMessage;
if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
- u16 hdrlen =
pMessage->h.raw - pMessage->data
;
+ u16 hdrlen =
skb_transport_offset(pMessage)
;
u16 offset = hdrlen + pMessage->csum_offset;
u16 offset = hdrlen + pMessage->csum_offset;
- if ((
pMessage->h.ipiph->protocol == IPPROTO_UDP
) &&
+ if ((
ipip_hdr(pMessage)->protocol == IPPROTO_UDP
) &&
(pAC->GIni.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
pTxd->TBControl = BMU_TCP_CHECK;
(pAC->GIni.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
pTxd->TBControl = BMU_TCP_CHECK;
@@
-1681,7
+1681,7
@@
struct sk_buff *pMessage) /* pointer to send-message */
** Does the HW need to evaluate checksum for TCP or UDP packets?
*/
if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
** Does the HW need to evaluate checksum for TCP or UDP packets?
*/
if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
- u16 hdrlen =
pMessage->h.raw - pMessage->data
;
+ u16 hdrlen =
skb_transport_offset(pMessage)
;
u16 offset = hdrlen + pMessage->csum_offset;
Control = BMU_STFWD;
u16 offset = hdrlen + pMessage->csum_offset;
Control = BMU_STFWD;
@@
-1691,7
+1691,7
@@
struct sk_buff *pMessage) /* pointer to send-message */
** opcode for udp is not working in the hardware yet
** (Revision 2.0)
*/
** opcode for udp is not working in the hardware yet
** (Revision 2.0)
*/
- if ((
pMessage->h.ipiph->protocol == IPPROTO_UDP
) &&
+ if ((
ipip_hdr(pMessage)->protocol == IPPROTO_UDP
) &&
(pAC->GIni.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
Control |= BMU_TCP_CHECK;
(pAC->GIni.GIChipRev == 0) &&
(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
Control |= BMU_TCP_CHECK;
@@
-2127,7
+2127,7
@@
rx_start:
(dma_addr_t) PhysAddr,
FrameLength,
PCI_DMA_FROMDEVICE);
(dma_addr_t) PhysAddr,
FrameLength,
PCI_DMA_FROMDEVICE);
-
memcpy(pNewMsg->data
, pMsg, FrameLength);
+
skb_copy_to_linear_data(pNewMsg
, pMsg, FrameLength);
pci_dma_sync_single_for_device(pAC->PciDev,
(dma_addr_t) PhysAddr,
pci_dma_sync_single_for_device(pAC->PciDev,
(dma_addr_t) PhysAddr,
@@
-2193,7
+2193,6
@@
rx_start:
SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,
FrameLength, pRxPort->PortIndex);
SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,
FrameLength, pRxPort->PortIndex);
- pMsg->dev = pAC->dev[pRxPort->PortIndex];
pMsg->protocol = eth_type_trans(pMsg,
pAC->dev[pRxPort->PortIndex]);
netif_rx(pMsg);
pMsg->protocol = eth_type_trans(pMsg,
pAC->dev[pRxPort->PortIndex]);
netif_rx(pMsg);
@@
-2246,7
+2245,6
@@
rx_start:
(IFF_PROMISC | IFF_ALLMULTI)) != 0 ||
(ForRlmt & SK_RLMT_RX_PROTOCOL) ==
SK_RLMT_RX_PROTOCOL) {
(IFF_PROMISC | IFF_ALLMULTI)) != 0 ||
(ForRlmt & SK_RLMT_RX_PROTOCOL) ==
SK_RLMT_RX_PROTOCOL) {
- pMsg->dev = pAC->dev[pRxPort->PortIndex];
pMsg->protocol = eth_type_trans(pMsg,
pAC->dev[pRxPort->PortIndex]);
netif_rx(pMsg);
pMsg->protocol = eth_type_trans(pMsg,
pAC->dev[pRxPort->PortIndex]);
netif_rx(pMsg);
@@
-5188,6
+5186,9
@@
static struct pci_driver skge_driver = {
static int __init skge_init(void)
{
static int __init skge_init(void)
{
+ printk(KERN_NOTICE "sk98lin: driver has been replaced by the skge driver"
+ " and is scheduled for removal\n");
+
return pci_register_driver(&skge_driver);
}
return pci_register_driver(&skge_driver);
}