diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /net/atm | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/common.c | 3 | ||||
| -rw-r--r-- | net/atm/lec.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index b2bd5a624..e566554ee 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -26,6 +26,7 @@ #include <asm/uaccess.h> #include <asm/atomic.h> #include <asm/poll.h> +#include <asm/ioctls.h> #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) #include <linux/atmlec.h> @@ -376,6 +377,8 @@ int atm_recvmsg(struct socket *sock,struct msghdr *m,int total_len, if (error <= 0) return error; vcc->timestamp = skb->stamp; eff_len = skb->len > size ? size : skb->len; + if (skb->len > size) /* Not fit ? Report it... */ + m->msg_flags |= MSG_TRUNC; if (vcc->dev->ops->feedback) vcc->dev->ops->feedback(vcc,skb,(unsigned long) skb->data, (unsigned long) buff,eff_len); diff --git a/net/atm/lec.h b/net/atm/lec.h index 5dd0494e9..0ebd861c4 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h @@ -72,7 +72,7 @@ struct atm_lane_ops { * 2. LLC Data frames whose total length, including LLC field and data, * but not padding required to meet the minimum data frame length, * is less than 1536(0x0600) MUST be encoded by placing that length - * in the the h_type field. The LLC field follows header immediatelly. + * in the h_type field. The LLC field follows header immediatelly. * 3. LLC data frames longer than this maximum MUST be encoded by placing * the value 0 in the h_type field. * @@ -154,5 +154,5 @@ void lec_push(struct atm_vcc *vcc, struct sk_buff *skb); void atm_lane_init(void); void atm_lane_init_ops(struct atm_lane_ops *ops); -#endif _LEC_H_ +#endif /* _LEC_H_ */ |