Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed9bad06 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[IPV4] net/ipv4/arp.c: trivial annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd6d610a

include/net/arp.h

+4 −4
Original line number Diff line number Diff line
@@ -12,15 +12,15 @@ extern struct neigh_table arp_tbl; 
extern void	arp_init(void);

extern int	arp_find(unsigned char *haddr, struct sk_buff *skb);

extern int	arp_ioctl(unsigned int cmd, void __user *arg);

extern void     arp_send(int type, int ptype, u32 dest_ip, 

			 struct net_device *dev, u32 src_ip, 

extern void     arp_send(int type, int ptype, __be32 dest_ip,

			 struct net_device *dev, __be32 src_ip,

			 unsigned char *dest_hw, unsigned char *src_hw, unsigned char *th);

extern int	arp_bind_neighbour(struct dst_entry *dst);

extern int	arp_mc_map(u32 addr, u8 *haddr, struct net_device *dev, int dir);

extern void	arp_ifdown(struct net_device *dev);



extern struct sk_buff *arp_create(int type, int ptype, u32 dest_ip,

				  struct net_device *dev, u32 src_ip,

extern struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,

				  struct net_device *dev, __be32 src_ip,

				  unsigned char *dest_hw, unsigned char *src_hw,

				  unsigned char *target_hw);

extern void arp_xmit(struct sk_buff *skb);

net/bridge/netfilter/ebt_arpreply.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static int ebt_target_reply(struct sk_buff **pskb, unsigned int hooknr, 
   const void *data, unsigned int datalen)

{

	struct ebt_arpreply_info *info = (struct ebt_arpreply_info *)data;

	u32 _sip, *siptr, _dip, *diptr;

	__be32 _sip, *siptr, _dip, *diptr;

	struct arphdr _ah, *ap;

	unsigned char _sha[ETH_ALEN], *shp;

	struct sk_buff *skb = *pskb;

net/ipv4/arp.c

+15 −15
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) 
}



static int arp_ignore(struct in_device *in_dev, struct net_device *dev,

		      u32 sip, u32 tip)

		      __be32 sip, __be32 tip)

{

	int scope;
@@ -420,7 +420,7 @@ static int arp_ignore(struct in_device *in_dev, struct net_device *dev, 
	return !inet_confirm_addr(dev, sip, tip, scope);

}



static int arp_filter(__u32 sip, __u32 tip, struct net_device *dev)

static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)

{

	struct flowi fl = { .nl_u = { .ip4_u = { .daddr = sip,

						 .saddr = tip } } };
@@ -449,7 +449,7 @@ static int arp_filter(__u32 sip, __u32 tip, struct net_device *dev) 
 *	is allowed to use this function, it is scheduled to be removed. --ANK

 */



static int arp_set_predefined(int addr_hint, unsigned char * haddr, u32 paddr, struct net_device * dev)

static int arp_set_predefined(int addr_hint, unsigned char * haddr, __be32 paddr, struct net_device * dev)

{

	switch (addr_hint) {

	case RTN_LOCAL:
@@ -511,7 +511,7 @@ int arp_bind_neighbour(struct dst_entry *dst) 
	if (dev == NULL)

		return -EINVAL;

	if (n == NULL) {

		u32 nexthop = ((struct rtable*)dst)->rt_gateway;

		__be32 nexthop = ((struct rtable*)dst)->rt_gateway;

		if (dev->flags&(IFF_LOOPBACK|IFF_POINTOPOINT))

			nexthop = 0;

		n = __neigh_lookup_errno(
@@ -560,8 +560,8 @@ static inline int arp_fwd_proxy(struct in_device *in_dev, struct rtable *rt) 
 *	Create an arp packet. If (dest_hw == NULL), we create a broadcast

 *	message.

 */

struct sk_buff *arp_create(int type, int ptype, u32 dest_ip,

			   struct net_device *dev, u32 src_ip,

struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,

			   struct net_device *dev, __be32 src_ip,

			   unsigned char *dest_hw, unsigned char *src_hw,

			   unsigned char *target_hw)

{
@@ -675,8 +675,8 @@ void arp_xmit(struct sk_buff *skb) 
/*

 *	Create and send an arp packet.

 */

void arp_send(int type, int ptype, u32 dest_ip, 

	      struct net_device *dev, u32 src_ip, 

void arp_send(int type, int ptype, __be32 dest_ip,

	      struct net_device *dev, __be32 src_ip,

	      unsigned char *dest_hw, unsigned char *src_hw,

	      unsigned char *target_hw)

{
@@ -969,13 +969,13 @@ out_of_mem: 


static int arp_req_set(struct arpreq *r, struct net_device * dev)

{

	u32 ip = ((struct sockaddr_in *) &r->arp_pa)->sin_addr.s_addr;

	__be32 ip = ((struct sockaddr_in *) &r->arp_pa)->sin_addr.s_addr;

	struct neighbour *neigh;

	int err;



	if (r->arp_flags&ATF_PUBL) {

		u32 mask = ((struct sockaddr_in *) &r->arp_netmask)->sin_addr.s_addr;

		if (mask && mask != 0xFFFFFFFF)

		__be32 mask = ((struct sockaddr_in *) &r->arp_netmask)->sin_addr.s_addr;

		if (mask && mask != htonl(0xFFFFFFFF))

			return -EINVAL;

		if (!dev && (r->arp_flags & ATF_COM)) {

			dev = dev_getbyhwaddr(r->arp_ha.sa_family, r->arp_ha.sa_data);
@@ -1063,7 +1063,7 @@ static unsigned arp_state_to_flags(struct neighbour *neigh) 


static int arp_req_get(struct arpreq *r, struct net_device *dev)

{

	u32 ip = ((struct sockaddr_in *) &r->arp_pa)->sin_addr.s_addr;

	__be32 ip = ((struct sockaddr_in *) &r->arp_pa)->sin_addr.s_addr;

	struct neighbour *neigh;

	int err = -ENXIO;
@@ -1084,13 +1084,13 @@ static int arp_req_get(struct arpreq *r, struct net_device *dev) 
static int arp_req_delete(struct arpreq *r, struct net_device * dev)

{

	int err;

	u32 ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;

	__be32 ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;

	struct neighbour *neigh;



	if (r->arp_flags & ATF_PUBL) {

		u32 mask =

		__be32 mask =

		       ((struct sockaddr_in *)&r->arp_netmask)->sin_addr.s_addr;

		if (mask == 0xFFFFFFFF)

		if (mask == htonl(0xFFFFFFFF))

			return pneigh_delete(&arp_tbl, &ip, dev);

		if (mask == 0) {

			if (dev == NULL) {