diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:15 +0200 |
| commit | e188d2ec26e8cf6d4ba0908e76868e91b6999fdf (patch) | |
| tree | 268e1a3340d6e195a02068a31b70043088d95b8f /fs | |
| parent | 4ee01d2b469f65d92c6e7759152cd31fbfbb1414 (diff) | |
| parent | ab8e23f239ddda7fff4d9a12a9d856d346e0d553 (diff) | |
| download | barebox-e188d2ec26e8cf6d4ba0908e76868e91b6999fdf.tar.gz barebox-e188d2ec26e8cf6d4ba0908e76868e91b6999fdf.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs.c | 6 | ||||
| -rw-r--r-- | fs/tftp.c | 3 |
2 files changed, 3 insertions, 6 deletions
@@ -132,8 +132,8 @@ struct nfs_priv { struct net_connection *con; IPaddr_t server; char *path; - unsigned short mount_port; - unsigned short nfs_port; + uint16_t mount_port; + uint16_t nfs_port; uint32_t rpc_id; uint32_t rootfh_len; char rootfh[NFS3_FHSIZE]; @@ -1350,7 +1350,7 @@ static int nfs_probe(struct device_d *dev) debug("nfs: server: %s path: %s\n", tmp, npriv->path); - npriv->con = net_udp_new(npriv->server, 0, nfs_handler, npriv); + npriv->con = net_udp_new(npriv->server, SUNRPC_PORT, nfs_handler, npriv); if (IS_ERR(npriv->con)) { ret = PTR_ERR(npriv->con); goto err1; @@ -75,7 +75,6 @@ struct file_priv { uint16_t last_block; int state; int err; - int server_port; const char *filename; int filesize; uint64_t resend_timeout; @@ -299,7 +298,6 @@ static void tftp_recv(struct file_priv *priv, case TFTP_OACK: tftp_parse_oack(priv, pkt, len); - priv->server_port = ntohs(uh_sport); priv->tftp_con->udp->uh_dport = uh_sport; if (priv->push) { @@ -322,7 +320,6 @@ static void tftp_recv(struct file_priv *priv, /* first block received */ priv->state = STATE_RDATA; priv->tftp_con->udp->uh_dport = uh_sport; - priv->server_port = ntohs(uh_sport); priv->last_block = 0; if (priv->block != 1) { /* Assertion */ |