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

Commit dcbd39a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 582fd487 4f55cd10

include/linux/atmdev.h

+10 −0
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ struct atm_dev_stats { 
					/* set interface ESI */

#define ATM_SETESIF	_IOW('a',ATMIOC_ITF+13,struct atmif_sioc)

					/* force interface ESI */

#define ATM_ADDLECSADDR	_IOW('a', ATMIOC_ITF+14, struct atmif_sioc)

					/* register a LECS address */

#define ATM_DELLECSADDR	_IOW('a', ATMIOC_ITF+15, struct atmif_sioc)

					/* unregister a LECS address */

#define ATM_GETLECSADDR	_IOW('a', ATMIOC_ITF+16, struct atmif_sioc)

					/* retrieve LECS address(es) */



#define ATM_GETSTAT	_IOW('a',ATMIOC_SARCOM+0,struct atmif_sioc)

					/* get AAL layer statistics */

#define ATM_GETSTATZ	_IOW('a',ATMIOC_SARCOM+1,struct atmif_sioc)
@@ -328,6 +335,8 @@ struct atm_dev_addr { 
	struct list_head entry;		/* next address */

};



enum atm_addr_type_t { ATM_ADDR_LOCAL, ATM_ADDR_LECS };



struct atm_dev {

	const struct atmdev_ops *ops;	/* device operations; NULL if unused */

	const struct atmphy_ops *phy;	/* PHY operations, may be undefined */
@@ -338,6 +347,7 @@ struct atm_dev { 
	void		*phy_data;	/* private PHY date */

	unsigned long	flags;		/* device flags (ATM_DF_*) */

	struct list_head local;		/* local ATM addresses */

	struct list_head lecs;		/* LECS ATM addresses learned via ILMI */

	unsigned char	esi[ESI_LEN];	/* ESI ("MAC" addr) */

	struct atm_cirange ci_range;	/* VPI/VCI range */

	struct k_atm_dev_stats stats;	/* statistics */

include/net/sctp/user.h

+21 −12
Original line number Diff line number Diff line
@@ -103,16 +103,20 @@ enum sctp_optname { 
#define SCTP_SOCKOPT_BINDX_REM	SCTP_SOCKOPT_BINDX_REM

	SCTP_SOCKOPT_PEELOFF, 	/* peel off association. */

#define SCTP_SOCKOPT_PEELOFF	SCTP_SOCKOPT_PEELOFF

	SCTP_GET_PEER_ADDRS_NUM, 	/* Get number of peer addresss. */

#define SCTP_GET_PEER_ADDRS_NUM	SCTP_GET_PEER_ADDRS_NUM

	SCTP_GET_PEER_ADDRS_NUM_OLD, 	/* Get number of peer addresss. */

#define SCTP_GET_PEER_ADDRS_NUM_OLD	SCTP_GET_PEER_ADDRS_NUM_OLD

	SCTP_GET_PEER_ADDRS_OLD, 	/* Get all peer addresss. */

#define SCTP_GET_PEER_ADDRS_OLD	SCTP_GET_PEER_ADDRS_OLD

	SCTP_GET_LOCAL_ADDRS_NUM_OLD, 	/* Get number of local addresss. */

#define SCTP_GET_LOCAL_ADDRS_NUM_OLD	SCTP_GET_LOCAL_ADDRS_NUM_OLD

	SCTP_GET_LOCAL_ADDRS_OLD, 	/* Get all local addresss. */

#define SCTP_GET_LOCAL_ADDRS_OLD	SCTP_GET_LOCAL_ADDRS_OLD

	SCTP_SOCKOPT_CONNECTX, /* CONNECTX requests. */

#define SCTP_SOCKOPT_CONNECTX	SCTP_SOCKOPT_CONNECTX

	SCTP_GET_PEER_ADDRS, 	/* Get all peer addresss. */

#define SCTP_GET_PEER_ADDRS	SCTP_GET_PEER_ADDRS

	SCTP_GET_LOCAL_ADDRS_NUM, 	/* Get number of local addresss. */

#define SCTP_GET_LOCAL_ADDRS_NUM	SCTP_GET_LOCAL_ADDRS_NUM

	SCTP_GET_LOCAL_ADDRS, 	/* Get all local addresss. */

#define SCTP_GET_LOCAL_ADDRS	SCTP_GET_LOCAL_ADDRS

	SCTP_SOCKOPT_CONNECTX, /* CONNECTX requests. */

#define SCTP_SOCKOPT_CONNECTX	SCTP_SOCKOPT_CONNECTX

};



/*
@@ -239,7 +243,7 @@ struct sctp_paddr_change { 
	int spc_state;

	int spc_error;

	sctp_assoc_t spc_assoc_id;

};

} __attribute__((packed, aligned(4)));



/*

 *    spc_state:  32 bits (signed integer)
@@ -464,7 +468,7 @@ struct sctp_assocparams { 
struct sctp_setpeerprim {

	sctp_assoc_t            sspp_assoc_id;

	struct sockaddr_storage sspp_addr;

};

} __attribute__((packed, aligned(4)));



/*

 * 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
@@ -477,7 +481,7 @@ struct sctp_setpeerprim { 
struct sctp_prim {

	sctp_assoc_t            ssp_assoc_id;

	struct sockaddr_storage ssp_addr;

};

} __attribute__((packed, aligned(4)));



/*

 * 7.1.11 Set Adaption Layer Indicator (SCTP_ADAPTION_LAYER)
@@ -504,7 +508,7 @@ struct sctp_paddrparams { 
	struct sockaddr_storage	spp_address;

	__u32			spp_hbinterval;

	__u16			spp_pathmaxrxt;

};

} __attribute__((packed, aligned(4)));



/*

 * 7.2.2 Peer Address Information
@@ -523,7 +527,7 @@ struct sctp_paddrinfo { 
	__u32			spinfo_srtt;

	__u32			spinfo_rto;

	__u32			spinfo_mtu;

};

} __attribute__((packed, aligned(4)));



/* Peer addresses's state. */

enum sctp_spinfo_state {
@@ -559,11 +563,16 @@ struct sctp_status { 
 * SCTP_GET_LOCAL_ADDRS socket options used internally to implement

 * sctp_getpaddrs() and sctp_getladdrs() API. 

 */

struct sctp_getaddrs {

struct sctp_getaddrs_old {

	sctp_assoc_t            assoc_id;

	int			addr_num;

	struct sockaddr		__user *addrs;

};

struct sctp_getaddrs {

	sctp_assoc_t		assoc_id; /*input*/

	__u32			addr_num; /*output*/

	__u8			addrs[0]; /*output, variable size*/

};



/* These are bit fields for msghdr->msg_flags.  See section 5.1.  */

/* On user space Linux, these live in <bits/socket.h> as an enum.  */

net/atm/addr.c

+38 −13
Original line number Diff line number Diff line
@@ -44,31 +44,43 @@ static void notify_sigd(struct atm_dev *dev) 
	sigd_enq(NULL, as_itf_notify, NULL, &pvc, NULL);

}



void atm_reset_addr(struct atm_dev *dev)

void atm_reset_addr(struct atm_dev *dev, enum atm_addr_type_t atype)

{

	unsigned long flags;

	struct atm_dev_addr *this, *p;

	struct list_head *head;



	spin_lock_irqsave(&dev->lock, flags);

	list_for_each_entry_safe(this, p, &dev->local, entry) {

	if (atype == ATM_ADDR_LECS)

		head = &dev->lecs;

	else

		head = &dev->local;

	list_for_each_entry_safe(this, p, head, entry) {

		list_del(&this->entry);

		kfree(this);

	}

	spin_unlock_irqrestore(&dev->lock, flags);

	if (head == &dev->local)

		notify_sigd(dev);

}



int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr)

int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t atype)

{

	unsigned long flags;

	struct atm_dev_addr *this;

	struct list_head *head;

	int error;



	error = check_addr(addr);

	if (error)

		return error;

	spin_lock_irqsave(&dev->lock, flags);

	list_for_each_entry(this, &dev->local, entry) {

	if (atype == ATM_ADDR_LECS)

		head = &dev->lecs;

	else

		head = &dev->local;

	list_for_each_entry(this, head, entry) {

		if (identical(&this->addr, addr)) {

			spin_unlock_irqrestore(&dev->lock, flags);

			return -EEXIST;
@@ -80,27 +92,35 @@ int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr) 
		return -ENOMEM;

	}

	this->addr = *addr;

	list_add(&this->entry, &dev->local);

	list_add(&this->entry, head);

	spin_unlock_irqrestore(&dev->lock, flags);

	if (head == &dev->local)

		notify_sigd(dev);

	return 0;

}



int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr)

int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t atype)

{

	unsigned long flags;

	struct atm_dev_addr *this;

	struct list_head *head;

	int error;



	error = check_addr(addr);

	if (error)

		return error;

	spin_lock_irqsave(&dev->lock, flags);

	list_for_each_entry(this, &dev->local, entry) {

	if (atype == ATM_ADDR_LECS)

		head = &dev->lecs;

	else

		head = &dev->local;

	list_for_each_entry(this, head, entry) {

		if (identical(&this->addr, addr)) {

			list_del(&this->entry);

			spin_unlock_irqrestore(&dev->lock, flags);

			kfree(this);

			if (head == &dev->local)

				notify_sigd(dev);

			return 0;

		}
@@ -110,22 +130,27 @@ int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr) 
}



int atm_get_addr(struct atm_dev *dev, struct sockaddr_atmsvc __user * buf,

		 size_t size)

		 size_t size, enum atm_addr_type_t atype)

{

	unsigned long flags;

	struct atm_dev_addr *this;

	struct list_head *head;

	int total = 0, error;

	struct sockaddr_atmsvc *tmp_buf, *tmp_bufp;



	spin_lock_irqsave(&dev->lock, flags);

	list_for_each_entry(this, &dev->local, entry)

	if (atype == ATM_ADDR_LECS)

		head = &dev->lecs;

	else

		head = &dev->local;

	list_for_each_entry(this, head, entry)

	    total += sizeof(struct sockaddr_atmsvc);

	tmp_buf = tmp_bufp = kmalloc(total, GFP_ATOMIC);

	if (!tmp_buf) {

		spin_unlock_irqrestore(&dev->lock, flags);

		return -ENOMEM;

	}

	list_for_each_entry(this, &dev->local, entry)

	list_for_each_entry(this, head, entry)

	    memcpy(tmp_bufp++, &this->addr, sizeof(struct sockaddr_atmsvc));

	spin_unlock_irqrestore(&dev->lock, flags);

	error = total > size ? -E2BIG : total;

net/atm/addr.h

+7 −5
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ 
#include <linux/atm.h>

#include <linux/atmdev.h>





void atm_reset_addr(struct atm_dev *dev);

int atm_add_addr(struct atm_dev *dev,struct sockaddr_atmsvc *addr);

int atm_del_addr(struct atm_dev *dev,struct sockaddr_atmsvc *addr);

int atm_get_addr(struct atm_dev *dev,struct sockaddr_atmsvc __user *buf,size_t size);

void atm_reset_addr(struct atm_dev *dev, enum atm_addr_type_t type);

int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t type);

int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t type);

int atm_get_addr(struct atm_dev *dev, struct sockaddr_atmsvc __user *buf,

		 size_t size, enum atm_addr_type_t type);



#endif

net/atm/br2684.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		/* netif_stop_queue(dev); */

		dev_kfree_skb(skb);

		read_unlock(&devs_lock);

		return -EUNATCH;

		return 0;

	}

	if (!br2684_xmit_vcc(skb, brdev, brvcc)) {

		/*