[NET]: __be'ify *_type_trans()
tr_type_trans(), hippi_type_trans() left as-is. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
84531c24f2
commit
ab611487d8
16 changed files with 20 additions and 27 deletions
|
@ -369,7 +369,7 @@ static void myri_tx(struct myri_eth *mp, struct net_device *dev)
|
|||
* 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;
|
||||
|
|
|
@ -540,7 +540,7 @@ plip_receive(unsigned short nibble_timeout, struct net_device *dev,
|
|||
* 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;
|
||||
|
|
|
@ -861,8 +861,7 @@ fst_tx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
|
|||
/*
|
||||
* 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;
|
||||
|
|
|
@ -91,8 +91,7 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
|
|||
|
||||
|
||||
|
||||
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;
|
||||
|
||||
|
|
|
@ -66,8 +66,7 @@ static void ppp_close(struct net_device *dev)
|
|||
|
||||
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -2210,7 +2210,7 @@ qeth_get_next_skb(struct qeth_card *card, struct qdio_buffer *buffer,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline unsigned short
|
||||
static inline __be16
|
||||
qeth_type_trans(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct qeth_card *card;
|
||||
|
|
|
@ -33,7 +33,7 @@ extern int eth_header(struct sk_buff *skb, struct net_device *dev,
|
|||
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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -242,8 +242,8 @@ static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev)
|
|||
}
|
||||
|
||||
|
||||
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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -122,10 +122,10 @@ static int fddi_rebuild_header(struct sk_buff *skb)
|
|||
* 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
|
||||
|
|
|
@ -289,8 +289,7 @@ xmit will add the additional header part in that case */
|
|||
* 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;
|
||||
|
|
|
@ -155,7 +155,7 @@ int eth_rebuild_header(struct sk_buff *skb)
|
|||
* 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;
|
||||
|
|
|
@ -358,10 +358,10 @@ int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev,
|
|||
*/
|
||||
|
||||
|
||||
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(struct sk_buff *skb, struct net_device *dev)
|
|||
skb->data[cnt+3], dev->name);
|
||||
return 0;
|
||||
}
|
||||
ethertype = *((unsigned short*)&skb->data[cnt+4]);
|
||||
ethertype = *((__be16*)&skb->data[cnt+4]);
|
||||
cnt += 6;
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in a new issue