diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-28 09:26:07 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-28 09:27:36 (GMT) |
| commit | 458ce2910aa83d8a2cafb489d727f7da839e73c6 (patch) | |
| tree | 28e088137eb068e5620f17eaf0ca19d1562006ed /include/linux/atmdev.h | |
| parent | 69466466ce889cd2cbc8cda9ff1c6083f48cc7f9 (diff) | |
| parent | 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691 (diff) | |
| download | linux-fsl-qoriq-458ce2910aa83d8a2cafb489d727f7da839e73c6.tar.xz | |
Merge branch 'linus' into x86/asm
Sync up the latest NMI fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/atmdev.h')
| -rw-r--r-- | include/linux/atmdev.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 49a83ca..f4ff882 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -445,16 +445,6 @@ void vcc_insert_socket(struct sock *sk); void atm_dev_release_vccs(struct atm_dev *dev); -/* - * This is approximately the algorithm used by alloc_skb. - * - */ - -static inline int atm_guess_pdu2truesize(int size) -{ - return SKB_DATA_ALIGN(size) + sizeof(struct skb_shared_info); -} - static inline void atm_force_charge(struct atm_vcc *vcc,int truesize) { |