tr_type_trans(), hippi_type_trans() left as-is.
Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
---
drivers/net/myri_sbus.c | 2 +-
drivers/net/plip.c | 2 +-
drivers/net/wan/farsync.c | 3 +--
drivers/net/wan/hdlc_cisco.c | 3 +--
drivers/net/wan/hdlc_ppp.c | 3 +--
drivers/net/wan/hdlc_raw.c | 3 +--
drivers/s390/net/qeth_main.c | 2 +-
include/linux/etherdevice.h | 2 +-
include/linux/fddidevice.h | 2 +-
include/linux/hdlc.h | 4 ++--
include/linux/wanrouter.h | 3 +--
include/net/x25device.h | 3 +--
net/802/fddi.c | 4 ++--
net/atm/br2684.c | 3 +--
net/ethernet/eth.c | 2 +-
net/wanrouter/wanmain.c | 6 +++---
16 files changed, 20 insertions(+), 27 deletions(-)
diff -uprN linux-vanilla/drivers/net/myri_sbus.c
linux-eth_type_trans/drivers/net/myri_sbus.c
--- linux-vanilla/drivers/net/myri_sbus.c 2005-07-11 04:32:38.000000000
+0400
+++ linux-eth_type_trans/drivers/net/myri_sbus.c 2005-07-12
22:43:23.000000000 +0400
@@ -369,7 +369,7 @@ static void myri_tx(struct myri_eth *mp,
* assume 802.3 if the type field is short enough to be a length.
* This is normal practice and works for any 'now in use' protocol.
*/
-static unsigned short myri_type_trans(struct sk_buff *skb, struct net_device
*dev)
+static __be16 myri_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct ethhdr *eth;
unsigned char *rawp;
diff -uprN linux-vanilla/drivers/net/plip.c
linux-eth_type_trans/drivers/net/plip.c
--- linux-vanilla/drivers/net/plip.c 2005-07-11 04:32:38.000000000 +0400
+++ linux-eth_type_trans/drivers/net/plip.c 2005-07-12 22:44:07.000000000
+0400
@@ -540,7 +540,7 @@ plip_receive(unsigned short nibble_timeo
* in far too many old systems not all even running Linux.
*/
-static unsigned short plip_type_trans(struct sk_buff *skb, struct net_device
*dev)
+static __be16 plip_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct ethhdr *eth;
unsigned char *rawp;
diff -uprN linux-vanilla/drivers/net/wan/farsync.c
linux-eth_type_trans/drivers/net/wan/farsync.c
--- linux-vanilla/drivers/net/wan/farsync.c 2005-07-11 04:32:38.000000000
+0400
+++ linux-eth_type_trans/drivers/net/wan/farsync.c 2005-07-12
22:40:57.000000000 +0400
@@ -861,8 +861,7 @@ fst_tx_dma_complete(struct fst_card_info
/*
* Mark it for our own raw sockets interface
*/
-static unsigned short farsync_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static __be16 farsync_type_trans(struct sk_buff *skb, struct net_device *dev)
{
skb->dev = dev;
skb->mac.raw = skb->data;
diff -uprN linux-vanilla/drivers/net/wan/hdlc_cisco.c
linux-eth_type_trans/drivers/net/wan/hdlc_cisco.c
--- linux-vanilla/drivers/net/wan/hdlc_cisco.c 2005-07-11 04:32:38.000000000
+0400
+++ linux-eth_type_trans/drivers/net/wan/hdlc_cisco.c 2005-07-12
22:42:18.000000000 +0400
@@ -91,8 +91,7 @@ static void cisco_keepalive_send(struct
-static unsigned short cisco_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev)
{
hdlc_header *data = (hdlc_header*)skb->data;
diff -uprN linux-vanilla/drivers/net/wan/hdlc_ppp.c
linux-eth_type_trans/drivers/net/wan/hdlc_ppp.c
--- linux-vanilla/drivers/net/wan/hdlc_ppp.c 2005-07-11 04:32:38.000000000
+0400
+++ linux-eth_type_trans/drivers/net/wan/hdlc_ppp.c 2005-07-12
22:41:22.000000000 +0400
@@ -66,8 +66,7 @@ static void ppp_close(struct net_device
-static unsigned short ppp_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static __be16 ppp_type_trans(struct sk_buff *skb, struct net_device *dev)
{
return __constant_htons(ETH_P_WAN_PPP);
}
diff -uprN linux-vanilla/drivers/net/wan/hdlc_raw.c
linux-eth_type_trans/drivers/net/wan/hdlc_raw.c
--- linux-vanilla/drivers/net/wan/hdlc_raw.c 2005-07-11 04:32:38.000000000
+0400
+++ linux-eth_type_trans/drivers/net/wan/hdlc_raw.c 2005-07-12
22:41:43.000000000 +0400
@@ -24,8 +24,7 @@
#include <linux/hdlc.h>
-static unsigned short raw_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static __be16 raw_type_trans(struct sk_buff *skb, struct net_device *dev)
{
return __constant_htons(ETH_P_IP);
}
diff -uprN linux-vanilla/drivers/s390/net/qeth_main.c
linux-eth_type_trans/drivers/s390/net/qeth_main.c
--- linux-vanilla/drivers/s390/net/qeth_main.c 2005-07-11 04:32:39.000000000
+0400
+++ linux-eth_type_trans/drivers/s390/net/qeth_main.c 2005-07-12
22:45:24.000000000 +0400
@@ -2210,7 +2210,7 @@ no_mem:
return NULL;
}
-static inline unsigned short
+static inline __be16
qeth_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct qeth_card *card;
diff -uprN linux-vanilla/include/linux/etherdevice.h
linux-eth_type_trans/include/linux/etherdevice.h
--- linux-vanilla/include/linux/etherdevice.h 2005-07-11 04:32:41.000000000
+0400
+++ linux-eth_type_trans/include/linux/etherdevice.h 2005-07-12
21:26:53.000000000 +0400
@@ -33,7 +33,7 @@ extern int eth_header(struct sk_buff *s
unsigned short type, void *daddr,
void *saddr, unsigned len);
extern int eth_rebuild_header(struct sk_buff *skb);
-extern unsigned short eth_type_trans(struct sk_buff *skb, struct net_device
*dev);
+extern __be16 eth_type_trans(struct sk_buff *skb, struct net_device
*dev);
extern void eth_header_cache_update(struct hh_cache *hh, struct
net_device *dev,
unsigned char * haddr);
extern int eth_header_cache(struct neighbour *neigh,
diff -uprN linux-vanilla/include/linux/fddidevice.h
linux-eth_type_trans/include/linux/fddidevice.h
--- linux-vanilla/include/linux/fddidevice.h 2005-07-11 04:32:41.000000000
+0400
+++ linux-eth_type_trans/include/linux/fddidevice.h 2005-07-12
22:36:11.000000000 +0400
@@ -25,7 +25,7 @@
#include <linux/if_fddi.h>
#ifdef __KERNEL__
-extern unsigned short fddi_type_trans(struct sk_buff *skb,
+extern __be16 fddi_type_trans(struct sk_buff *skb,
struct net_device *dev);
extern struct net_device *alloc_fddidev(int sizeof_priv);
#endif
diff -uprN linux-vanilla/include/linux/hdlc.h
linux-eth_type_trans/include/linux/hdlc.h
--- linux-vanilla/include/linux/hdlc.h 2005-07-11 04:32:41.000000000 +0400
+++ linux-eth_type_trans/include/linux/hdlc.h 2005-07-12 22:49:13.000000000
+0400
@@ -242,8 +242,8 @@ static __inline__ struct net_device_stat
}
-static __inline__ unsigned short hdlc_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
diff -uprN linux-vanilla/include/linux/wanrouter.h
linux-eth_type_trans/include/linux/wanrouter.h
--- linux-vanilla/include/linux/wanrouter.h 2005-07-11 04:32:41.000000000
+0400
+++ linux-eth_type_trans/include/linux/wanrouter.h 2005-07-12
22:39:42.000000000 +0400
@@ -516,8 +516,7 @@ struct wan_device {
/* Public functions available for device drivers */
extern int register_wan_device(struct wan_device *wandev);
extern int unregister_wan_device(char *name);
-unsigned short wanrouter_type_trans(struct sk_buff *skb,
- struct net_device *dev);
+__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev);
int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev,
unsigned short type);
diff -uprN linux-vanilla/include/net/x25device.h
linux-eth_type_trans/include/net/x25device.h
--- linux-vanilla/include/net/x25device.h 2005-07-11 04:32:41.000000000
+0400
+++ linux-eth_type_trans/include/net/x25device.h 2005-07-12
22:48:38.000000000 +0400
@@ -5,8 +5,7 @@
#include <linux/if_packet.h>
#include <linux/skbuff.h>
-static inline unsigned short x25_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static inline __be16 x25_type_trans(struct sk_buff *skb, struct net_device
*dev)
{
skb->mac.raw = skb->data;
skb->input_dev = skb->dev = dev;
diff -uprN linux-vanilla/net/802/fddi.c linux-eth_type_trans/net/802/fddi.c
--- linux-vanilla/net/802/fddi.c 2005-07-11 04:32:41.000000000 +0400
+++ linux-eth_type_trans/net/802/fddi.c 2005-07-12 22:35:39.000000000 +0400
@@ -122,10 +122,10 @@ static int fddi_rebuild_header(struct sk
* the proper pointer to the start of packet data (skb->data).
*/
-unsigned short fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
+__be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct fddihdr *fddi = (struct fddihdr *)skb->data;
- unsigned short type;
+ __be16 type;
/*
* Set mac.raw field to point to FC byte, set data field to point
diff -uprN linux-vanilla/net/atm/br2684.c linux-eth_type_trans/net/atm/br2684.c
--- linux-vanilla/net/atm/br2684.c 2005-07-11 04:32:41.000000000 +0400
+++ linux-eth_type_trans/net/atm/br2684.c 2005-07-12 22:37:57.000000000
+0400
@@ -289,8 +289,7 @@ xmit will add the additional header part
* This is similar to eth_type_trans, which cannot be used because of
* our dev->hard_header_len
*/
-static inline unsigned short br_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct ethhdr *eth;
unsigned char *rawp;
diff -uprN linux-vanilla/net/ethernet/eth.c
linux-eth_type_trans/net/ethernet/eth.c
--- linux-vanilla/net/ethernet/eth.c 2005-07-11 04:32:42.000000000 +0400
+++ linux-eth_type_trans/net/ethernet/eth.c 2005-07-12 21:26:03.000000000
+0400
@@ -155,7 +155,7 @@ int eth_rebuild_header(struct sk_buff *s
* This is normal practice and works for any 'now in use' protocol.
*/
-unsigned short eth_type_trans(struct sk_buff *skb, struct net_device *dev)
+__be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
{
struct ethhdr *eth;
unsigned char *rawp;
diff -uprN linux-vanilla/net/wanrouter/wanmain.c
linux-eth_type_trans/net/wanrouter/wanmain.c
--- linux-vanilla/net/wanrouter/wanmain.c 2005-07-11 04:32:42.000000000
+0400
+++ linux-eth_type_trans/net/wanrouter/wanmain.c 2005-07-12
22:39:12.000000000 +0400
@@ -358,10 +358,10 @@ int wanrouter_encapsulate(struct sk_buff
*/
-unsigned short wanrouter_type_trans(struct sk_buff *skb, struct net_device
*dev)
+__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev)
{
int cnt = skb->data[0] ? 0 : 1; /* there may be a pad present */
- unsigned short ethertype;
+ __be16 ethertype;
switch (skb->data[cnt]) {
case NLPID_IP: /* IP datagramm */
@@ -379,7 +379,7 @@ unsigned short wanrouter_type_trans(stru
skb->data[cnt+3], dev->name);
return 0;
}
- ethertype = *((unsigned short*)&skb->data[cnt+4]);
+ ethertype = *((__be16*)&skb->data[cnt+4]);
cnt += 6;
break;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
